Граф коммитов

15 Коммитов

Автор SHA1 Сообщение Дата
Nick Alexander c387030feb Backed out changeset 746468f5d979 (bug 1233882).
--HG--
extra : commitid : HtySXbh21EG
extra : rebase_source : 380db13c459c88d21b7f14d0d6830e7ab1094cc1
2016-02-05 21:19:13 -08:00
Nick Alexander dfb9b5b160 Bug 1234629 - Post: Add Gradle support for bouncer. r=me
--HG--
extra : commitid : 6jL7OTORPHp
extra : rebase_source : 19cc23344c425082888863cf7dbd00049ab1e3a1
extra : source : 54a3d0851bc60d26fb4744c605787031070052c8
extra : histedit_source : 842b7f6fafd9ee4ba00805b83d088cd9bf97e5cf
2016-01-26 11:54:00 -08:00
Nick Alexander 2f5eb6ac5e Bug 1233882 - Fold base Gradle project into app Gradle project. r=sebastian,mcomella
DONTBUILD NPOTB

Using the real Android manifest tripped up Robolectric, so I've taken
the easy way out and added a dummy TestGeckoApplication; see comment
in the code.

--HG--
rename : mobile/android/app/base/lint.xml => mobile/android/app/lint.xml
rename : mobile/android/tests/background/junit4/resources/robolectric.properties => mobile/android/app/src/main/resources/robolectric.properties
extra : commitid : 2aEbQRv0D7m
extra : rebase_source : c0f014e3fba7008967f8f9782125f940fcc89fe6
extra : amend_source : 46bfdfb116c026da490750a23a9c9188ab4cdf9a
extra : source : a7f63b3721cd3ba105990bbb37a87044383d26d9
2016-01-17 21:52:46 -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 1288f37eaf Bug 1233882 - Fold base Gradle project into app Gradle project. r=sebastian,mcomella
DONTBUILD NPOTB

Using the real Android manifest tripped up Robolectric, so I've taken
the easy way out and added a dummy TestGeckoApplication; see comment
in the code.

--HG--
rename : mobile/android/app/base/lint.xml => mobile/android/app/lint.xml
rename : mobile/android/tests/background/junit4/resources/robolectric.properties => mobile/android/app/src/main/resources/robolectric.properties
extra : commitid : BSiXkLh5kSh
extra : rebase_source : ee178b04cd727e11a65f0550d88f1cd951cc5b7a
extra : amend_source : 45f49104a4687cf4cb71391c3f3ac2def8ef716a
2016-01-17 21:52:46 -08:00
Nick Alexander 242ce6bb3e Bug 1234629 - Post: Add Gradle support for bouncer. r=me
--HG--
extra : commitid : 6jL7OTORPHp
extra : rebase_source : 8151fcd1768b7bfd0a4386dd68c8910894cae892
extra : histedit_source : 673771296f66c8ec5885fef25999e5e195a1767e
2016-01-26 11:54:00 -08:00
Nick Alexander 63de561f49 Bug 1231667 - Set Android SDK directory in topsrcdir Gradle configuration. r=me f=mcomella
--HG--
extra : commitid : JaIcJaQkY0L
extra : rebase_source : 874d2ee3c68058b5c96997437a78155ec789c6c5
extra : histedit_source : 7a1c2bc56259d10ccd6b02451016c83c52135351
2015-12-10 10:51:42 -05:00
Nick Alexander e171bf31ec Bug 1107811 - Part 3: Fix Gradle configurations. r=me
--HG--
extra : commitid : 6nPFZN21OLN
extra : rebase_source : 871c47b4c8d45794ad9e1704a3978099f4693923
extra : histedit_source : 0b73868c4baae9ec1d4ed0bbcf2629b7ebb579e6%2Cb36560dede8a0c4925e117b28494297ea25abfee
2015-12-05 17:33:55 -08:00
Nick Alexander 5ab3a4ac26 Bug 1228430 - Move build.gradle out of mobile/android/base. r=me
DONTBUILD NPOTB

--HG--
rename : mobile/android/base/build.gradle => mobile/android/app/base/build.gradle
extra : commitid : EhT7Osnyxex
2015-11-26 13:02:00 -08:00
Nick Alexander 44046732fb Bug 1220887 - Make 'base' Gradle project in the srcdir. r=sebastian
This is the last Gradle project that isn't in the srcdir.  Since base/
doesn't have the correct package prefix directory structure, we still
need to symlink, but we only need one link.  This effectively
deprecates |mach gradle-install|.

This should improve the robustness of our Gradle configuration,
ensuring that we always have projects to import.  Since
settings.gradle executes very early in the IDE import project
sequence: before Gradle project evaluation time, and thus before any
Gradle task is executed, we should always see a complete project.  (It
was possible to see incomplete Gradle configurations if |mach
gradle-install| hadn't been run at just the right time.)

--HG--
extra : commitid : 4zK7U5PAypH
extra : rebase_source : 91f8534a89f0311b36bd39f502e2f7609a1d78b0
2015-11-03 15:04:39 -08:00
Nick Alexander 63896e74a9 Bug 1219846 - Part 2: Make 'omnijar' project in srcdir. r=me
DONTBUILD NPOTB

The :omnijar project is for IntelliJ only; adding it neatly labels
folders we consider part of the omnijar in mobile/android.  The JAR
produced is not used.

We add an evaluation-time dependency from :app to :omnijar so that we
can declare the set of omnijar folders exactly once.  We'd prefer to
have the dependency in the other direction (to save evaluation time)
but there's an interface mismatch between the two Gradle model types.
See comments in the :omnijar project.

This is delicate.

--HG--
extra : commitid : 4TLicjMC7Bn
extra : rebase_source : 5dd4ab1e1fcdb296b46bc892b9e10414baadee61
2015-10-29 11:11:36 -07:00
Nick Alexander f76697e53c Bug 1219846 - Part 1: Add 'app' Gradle project in srcdir. r=me
DONTBUILD NPOTB

--HG--
rename : mobile/android/gradle/app/build.gradle => mobile/android/app/build.gradle
extra : commitid : LPlhL4qUWDC
extra : rebase_source : 335d1b0e7f3dadfffd0c96634d96723cb3a0b583
2015-10-28 16:01:23 -07:00
Nick Alexander 6e18f0f49b Bug 1123416 - Part 5: Make a 'thirdparty' Gradle project in the source directory. r=sebastian
I don't want to cut consumers of $OBJDIR/mobile/android/gradle over
yet, so this doesn't remove the existing 'thirdparty' project.

--HG--
rename : mobile/android/gradle/thirdparty/AndroidManifest.xml => mobile/android/thirdparty/AndroidManifest.xml
rename : mobile/android/gradle/thirdparty/build.gradle => mobile/android/thirdparty/build.gradle
extra : commitid : 8L8SU60bAig
extra : rebase_source : 0974b1e31821693b172f73119c4988c82a069a44
2015-10-20 15:32:50 -07:00
Nick Alexander b78d325570 Bug 1123416 - Part 2: Restrict $topsrcdir/build.gradle to Fennec. r=sebastian
--HG--
extra : commitid : A3m3EDPygxd
extra : rebase_source : 75945086f52ee94f9812568f4fe5654707312a03
2015-10-20 10:32:26 -07:00
Nick Alexander c1750592a8 Bug 1123416 - Part 1: Make topsrcdir a valid Gradle project root. r=sebastian
The sub-project definitions are still in the object directory (and
still installed by |mach gradle-install); over time, we'll migrate
them out.

The Gradle wrapper and {settings,build}.gradle in topsrcdir are
identical to those in mobile/android/gradle.  I don't like the
duplication, but I also don't want the burden of keeping the two
configurations identical.  We'll move away from the configuration
using mobile/android/gradle as quickly as we can.

--HG--
rename : mobile/android/gradle/build.gradle => build.gradle
rename : mobile/android/gradle/gradle/wrapper/gradle-wrapper.jar => gradle/wrapper/gradle-wrapper.jar
rename : mobile/android/gradle/gradle/wrapper/gradle-wrapper.properties => gradle/wrapper/gradle-wrapper.properties
rename : mobile/android/gradle/gradlew => gradlew
rename : mobile/android/gradle/settings.gradle => settings.gradle
extra : commitid : IkXCiKfkha1
extra : rebase_source : 4142fe37cd7e036d41fb122fe31cd232fcfdfc80
2015-10-21 15:07:55 -07:00