Commit Graph

27 Commits

Author SHA1 Message Date
Nick Alexander
c6f2ef4d51 Bug 1268944 - Remove GeckoView packaging. r=chmanchester
The best kind of patch: bulk deletion.  This removes two separate but
similar build flags, and an unsupported integration piece.  The first
packaged Fennec's resources into an ill-defined GeckoView archive; the
second built on the first to produce an Android ARchive for external
consumption.  Neither of these artifacts are supported or have
consumers; in fact, they mislead potential consumers, since they're
known to be broken.  The Gradle build work under the --with-gradle
flag, and significant follow-up, is the path forward if Mozilla wants
to invest in packaging GeckoView on Android for external consumption.
That is, rather than hacking together AAR files, we'll use the
well-supported Gradle mechanisms for building and publishing such
libraries.

MozReview-Commit-ID: 4Z1jJ8z0cyJ

--HG--
extra : rebase_source : b8e65f39c286313fe8963bf3832d9b6977ef188f
2016-07-25 11:54:03 -07:00
Tom Tromey
5538d692d3 Bug 1286877 - do not set c-basic-offset for python-mode; r=gps
This removes the unnecessary setting of c-basic-offset from all
python-mode files.

This was automatically generated using

    perl -pi -e 's/; *c-basic-offset: *[0-9]+//'

... on the affected files.

The bulk of these files are moz.build files but there a few others as
well.

MozReview-Commit-ID: 2pPf3DEiZqx

--HG--
extra : rebase_source : 0a7dcac80b924174a2c429b093791148ea6ac204
2016-07-14 10:16:42 -06:00
Justin D'Arcangelo
26ebe8e651 Bug 1272102 - FlyWeb Android UI. r=sebastian
--HG--
extra : amend_source : b1bac8800988d31790a64a293403336375e5effd
2016-06-08 21:37:06 -04:00
Nick Alexander
4085a8469b Bug 1258760 - Include Robocop support files when building --with-gradle. r=gps
The initial --with-gradle support disabled building the Android test
directories; everything was built from
mobile/android/app/build.gradle.  That doesn't declare support files
that need to be packaged for Robocop tests.  This patch stops building
instrumentation test APKs, which aren't used in automation under any
circumstance and which aren't packaged when building with Gradle; and
avoids building the Robocop APK by tweaking the Makefile.  That gets
support files in place while not using moz.build in place of Gradle.

I would have declared the support files elsewhere, but there are path
requirements that I couldn't make work, so in robocop/ they stay.

MozReview-Commit-ID: KCpXvqzYBsY

--HG--
extra : rebase_source : b99be8fada7787ee473f68265824cca2250c70a1
extra : histedit_source : fa19d3ede51e14707f400ab8527d44f5bf550f85
2016-03-15 16:02:01 -07:00
Nick Alexander
bc112329f3 Bug 1119520 - Add opt-in Gradle build mode for mobile/android. r=gps
Opt-in by adding --enable-gradle-mobile-android-builds.

Gradle dependencies (including the Android-Gradle plugin) are assumed
to be present.  Local developers will fetch them from the jcentral
repository.

Android-specific Maven dependencies are shipped as "extras" with the
Android SDK, and should be found automatically by the Android-Gradle
plugin.

MozReview-Commit-ID: 966XgddWgEu

--HG--
extra : rebase_source : 8e8c6156e1d06813c250662e104fd14c621d91ab
extra : source : 306cf0271d3e3a344fcbfd2baf75e0450c288cf1
extra : histedit_source : d17446714236c408699a0953882e84ac3a192380%2Cc21b166af79ef1e00215748820bc2670405ac1dc
2016-02-12 10:06:40 -08:00
Benjamin Smedberg
22cf864d75 Bug 1221724 followup - remove B2G and android references to redit, r=bustage on a CLOSED TREE
--HG--
extra : amend_source : 6c6e03586534d40ff5e841938e4738bc74b1da61
2016-02-11 11:44:33 -05:00
Nick Alexander
d466d2939f Bug 1234629 - Part 1: Create bouncer APK for OTA distribution installs. r=margaret,gps
This commit produces an "install bouncer" APK which is a "hollow
shell" that looks like the main Fennec APK.  In particular, both APKs have:

* the same Android package name (application id); and
* the same set of <permission>, <uses-permission>, and <uses-feature>
  blocks in their manifests.

The bouncer APK must always have an android:versionCode smaller than
the main Fennec APK; for now, we will just bump that manually
mobile/android/bouncer/moz.build.

--HG--
rename : mobile/android/javaaddons/Makefile.in => mobile/android/bouncer/Makefile.in
rename : mobile/android/app/assets/example_asset.txt => mobile/android/bouncer/assets/example_asset.txt
rename : mobile/android/javaaddons/moz.build => mobile/android/bouncer/moz.build
rename : mobile/android/base/resources/drawable-v21/logo.xml => mobile/android/bouncer/res/drawable-v21/logo.xml
rename : mobile/android/base/resources/drawable/logo.xml => mobile/android/bouncer/res/drawable/logo.xml
extra : commitid : 1XkuX1F0pMb
extra : rebase_source : c49ac53697927b0f3d1ee47bc1e7035c1b465e99
extra : source : aaa420ed66d754ecc17b19f5a12297d24371f1ca
extra : histedit_source : 0e3e2fa225c48ba48df72ff116fd62a7b1ef5ed2
2016-01-27 15:28:31 -08:00
Nigel Babu
ede1aa8b36 Backed out 10 changesets (bug 1234629, bug 1233882) for bustage on Android rc tests
Backed out changeset 9aa32d9a25df (bug 1234629)
Backed out changeset d73d36c9619b (bug 1234629)
Backed out changeset a7f63b3721cd (bug 1233882)
Backed out changeset c79f4a8c3e86 (bug 1234629)
Backed out changeset 400c030d3c01 (bug 1234629)
Backed out changeset 54a3d0851bc6 (bug 1234629)
Backed out changeset f80912ecfa87 (bug 1234629)
Backed out changeset 50bcadca2131 (bug 1234629)
Backed out changeset aaa420ed66d7 (bug 1234629)
Backed out changeset 7a62e97f07c2 (bug 1234629)

--HG--
rename : mobile/android/app/lint.xml => mobile/android/app/base/lint.xml
rename : mobile/android/app/src/main/resources/robolectric.properties => mobile/android/tests/background/junit4/resources/robolectric.properties
extra : commitid : KJVIqyGBEZg
2016-02-05 15:42:28 +05:30
Nick Alexander
3814ebb59b Bug 1234629 - Part 1: Create bouncer APK for OTA distribution installs. r=margaret,gps
This commit produces an "install bouncer" APK which is a "hollow
shell" that looks like the main Fennec APK.  In particular, both APKs have:

* the same Android package name (application id); and
* the same set of <permission>, <uses-permission>, and <uses-feature>
  blocks in their manifests.

The bouncer APK must always have an android:versionCode smaller than
the main Fennec APK; for now, we will just bump that manually
mobile/android/bouncer/moz.build.

--HG--
rename : mobile/android/javaaddons/Makefile.in => mobile/android/bouncer/Makefile.in
rename : mobile/android/app/assets/example_asset.txt => mobile/android/bouncer/assets/example_asset.txt
rename : mobile/android/javaaddons/moz.build => mobile/android/bouncer/moz.build
rename : mobile/android/base/resources/drawable-v21/logo.xml => mobile/android/bouncer/res/drawable-v21/logo.xml
rename : mobile/android/base/resources/drawable/logo.xml => mobile/android/bouncer/res/drawable/logo.xml
extra : commitid : 1XkuX1F0pMb
extra : rebase_source : 3154b4569efd4cccb4d5f72ff9bbff60d2744d3b
extra : histedit_source : 5e10ab9825bcf653a5a109c8e502658d52aedd79
2016-01-27 15:28:31 -08:00
Nigel Babu
0d0f65d439 Bug 1226301 - Follow up to fix bustage, r=bustage ON A CLOSED TREE
--HG--
extra : commitid : BpOSUJ5vYJE
extra : amend_source : 59bb4a1085101026d8392f14d418cc7743800b55
2016-01-06 10:05:00 +05:30
Nick Alexander
e7aa15f6f2 Bug 1230786 - Make |mach doc mobile/android| work. r=ahal
--HG--
rename : mobile/android/base/docs/adjust.rst => mobile/android/docs/adjust.rst
rename : mobile/android/base/docs/gradle.rst => mobile/android/docs/gradle.rst
rename : mobile/android/base/docs/localeswitching.rst => mobile/android/docs/localeswitching.rst
rename : mobile/android/base/docs/uitelemetry.rst => mobile/android/docs/uitelemetry.rst
extra : commitid : HdiZBovq6jw
extra : rebase_source : 03ac67d4b7d192df81d4920a21159173f6b21d97
2015-12-05 15:30:49 -08:00
Mike Hommey
9af046b5b4 Bug 1211765 - Remove remnants from --with-libxul-sdk. r=bsmedberg
The configure option has explicitly thrown an error for more than a year now,
and it happens that the remaining way to still forcefully use it has been
broken for more than 8 months.
2015-10-14 08:02:34 +09:00
Nick Alexander
41cd99af7b Bug 1168407 - Implement a bidirectional Java addon interface. f=jchen,r=rnewman,r=mfinkle
There are several parts to this ticket:

1) Produce javaaddons-1.0.jar, a standalone JAR defining a (versioned)
Java interface suitable for consumption by third-party Java addon
implementations.

2) Support the new V1 interface in the JavaAddonManager.

3) Add Robocop JavascriptTests testing the JavaScript message passing
interface to and from Java.

This patch can be read as "not in tests/" and "everything in tests/".

--HG--
rename : mobile/android/base/JavaAddonManager.java => mobile/android/base/javaaddons/JavaAddonManager.java
extra : commitid : ApOd0Iz9BrZ
extra : rebase_source : 9808487ec3b233f31524e3694d1e997af78a0c84
extra : histedit_source : c8883a01805d7ed39ffb58e8523103260aa72d0b
2015-06-17 21:47:29 -07:00
Nick Alexander
4f3f4284e1 Bug 1098239 - Rewrite mobile/android Gradle integration. r=me
This is a big patch, but it's essentially NPOTB.  The part that is POTB
is ... removing Gradle integration from the build.  I've implemented
|mach gradle-install| as a substitute for the build system stuff; it's
just so much easier to iterate on a mach command than a moz.build and
Makefile.in.

I'm landing this with self-review because this lessens the impact of the
Gradle integration on the build system and because I am the only person
who understands either the old or the new system.

You'll need to run |mach gradle-install| at top level to configure the
new Gradle integration.  But |mach gradle ...| does the right thing
configuration steps too.

This patch rewrites most of the Gradle integration.  The major changes
are:

* all .gradle files move into mobile/android/gradle;
* all the Gradle projects live in the object directory;
* mozconfig exposed to all build.gradle files;
* simplification of Android configuration between build.gradle files;
* support for user-specified version of build tools;
* first steps towards supporting builds from the source directory;
* bumps Gradle to 2.2.1;
* bumps the Android-Gradle plugin to 0.14.4.

This is seemingly a step backwards given that we'd prefer to ship the
.idea directory in the source directory.  But in fact we get closer to
that; it's possible to run ./gradlew in the source directory and get a
reasonable build.  We'll progress with this in time.  The win right now
is that the projects are nested, which makes importing work better on
Linux machines.

Unfortunately IntelliJ 13 and 14 now have conflicting Android-Gradle
plugin version requirements, so we now only support IntelliJ 14.0.2 and
above.

--HG--
rename : mobile/android/base/gradle_AndroidManifest.xml => mobile/android/gradle/base/AndroidManifest.xml
rename : mobile/android/base/gradle_AndroidManifest.xml => mobile/android/gradle/branding/AndroidManifest.xml
rename : mobile/android/gradle/omnijar/gradle_AndroidManifest.xml => mobile/android/gradle/omnijar/AndroidManifest.xml
rename : mobile/android/base/gradle_AndroidManifest.xml => mobile/android/gradle/preprocessed_code/AndroidManifest.xml
rename : mobile/android/base/gradle_AndroidManifest.xml => mobile/android/gradle/preprocessed_resources/AndroidManifest.xml
rename : mobile/android/thirdparty/gradle_AndroidManifest.xml => mobile/android/gradle/thirdparty/AndroidManifest.xml
2014-12-22 19:49:04 -08:00
Nick Alexander
75e27bd0f3 Bug 1041395 - Add gradle configuration. r=gps
--HG--
rename : mobile/android/base/docs/index.rst => mobile/android/base/docs/uitelemetry.rst
2014-11-10 13:47:30 -08:00
Mike Hommey
c0676d9dc8 Bug 1062221 - Change how DIRS and TEST_DIRS are handled. r=gps
Up to now, DIRS and TEST_DIRS were dumb values. This change makes them
a list of ContextDerivedValues, and handles the fact that some types of
paths are relative to the current source directory and others to the
topsrcdir.

This also makes us one step closer to fixing bug 991983.
2014-10-02 09:14:07 +09:00
Mike Hommey
2bab6202af Bug 1043820 - Remove PARALLEL_DIRS. r=gps 2014-07-29 08:57:59 +09:00
Nick Alexander
29fb36a96c Bug 1024708 - Part 2: Build stumbler JAR and integrate into Fennec. r=rnewman 2014-07-15 13:50:21 -07:00
Yury Delendik
04503ec93a Bug 905668 - Add browser's Shumway extension to Android Nightly. r=mfinkle, r=gps 2013-12-11 09:13:30 -06:00
Nick Alexander
da7e97a1c3 Bug 903534 - Part 1: Build background-debug.apk. r=glandium
--HG--
rename : mobile/android/moz.build => mobile/android/tests/background/junit3/moz.build
rename : mobile/android/moz.build => mobile/android/tests/background/moz.build
rename : mobile/android/moz.build => mobile/android/tests/moz.build
2013-10-01 12:43:30 -07:00
Shane Tully
95e80fd954 Bug 880118 - Integrate the GeckoView library into the build system r=cpeterson 2013-08-23 16:36:01 -07:00
Chris Peterson
b023249bff Back out 39ee92c06d6b (Bug 880118) because GeckoView breaks Android's l10n repacks 2013-08-28 15:41:12 -07:00
Shane Tully
c90fce8e29 Bug 880118 - Integrate the GeckoView library into the build system. r=glandium 2013-08-23 16:36:01 -07:00
Kyle Machulis
72a717a860 Bug 855465 - Add emacs python mode comments to moz.build files; r=gps 2013-04-01 11:36:59 -07:00
Kyle Machulis
43628a7867 Backout for changeset 03452b187c14 (Bug 855465) due to bustage on a CLOSED TREE; r=qdot 2013-03-29 15:12:58 -07:00
Kyle Machulis
334c0800cf Bug 855465 - Add emacs python mode comments to moz.build files; r=gps
--HG--
extra : rebase_source : 004a756492323e1a049586e85b3be5037159df20
2013-03-29 13:56:18 -07:00
Gregory Szorc
2b7640203a Bug 784841 - Part 18w: Convert /mobile/android; r=ted 2013-02-25 12:47:23 -08:00