Bug 1254353 - Build with Gradle in automation. r?gps
MozReview-Commit-ID: J7ucrLboeFC
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -35,16 +35,23 @@ ac_add_options --enable-elf-hack
ANDROID_NDK_VERSION="r10e"
ANDROID_NDK_VERSION_32BIT="r8c"
# Build Fennec
ac_add_options --enable-application=mobile/android
ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux"
+# Build with Gradle everywhere. Gradle and the Maven repository are installed
+# using tooltool.
+ac_add_options --with-gradle="$topsrcdir/gradle/bin/gradle"
+export GRADLE_MAVEN_REPOSITORY="file://$topsrcdir/jcentral"
+export GRADLE_FLAGS="--no-daemon --offline --debug"
+export MOZ_DISABLE_GECKOVIEW=1
+
ac_add_options --with-android-gnu-compiler-version=4.9
ac_add_options --with-android-version=9
ac_add_options --with-system-zlib
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
# Treat warnings as errors (modulo ALLOW_COMPILER_WARNINGS).
ac_add_options --enable-warnings-as-errors
deleted file mode 100644
--- a/mobile/android/config/tooltool-manifests/android-armv6/releng.manifest
+++ /dev/null
@@ -1,47 +0,0 @@
-[
-{
-"version": "Android NDK r8e",
-"size": 78706854,
-"digest": "8ff42509ecebfd7e20f8fac9987ed2b2c04942641eead674ee66f74014c5153f1c20080cd3ccb243af76ca7432df3c3f5b5ae08a478fd2817e62661a4edb437c",
-"algorithm": "sha512",
-"filename": "android-ndk.tar.bz2",
-"unpack": true
-},
-{
-"versions": [
- "Android SDK 6.0 / API 23",
- "Android tools r24.4",
- "Android build tools 23.0.1",
- "Android Support Repository (Support Library 23.0.1)",
- "Google Support Repository (Google Play Services 8.1.0)"
-],
-"size": 535625068,
-"visibility": "internal",
-"digest": "0627515046a23c1d109e2782865b1b3b546c1d552955e4156317f76cbb195eb630aa25feea3f4edd1c685f129da0c2a5169d4d6349c1c31d8a95158a4569a478",
-"algorithm": "sha512",
-"filename": "android-sdk-linux.tar.xz",
-"unpack": true
-},
-{
-"size": 167175,
-"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
-"algorithm": "sha512",
-"filename": "sccache.tar.bz2",
-"unpack": true
-},
-{
-"size": 4906080,
-"digest": "d735544e039da89382c53b2302b7408d4610247b4f8b5cdc5a4d5a8ec5470947b19e8ea7f7a37e78222e661347e394e0030d81f41534138b527b14e9c4e55634",
-"algorithm": "sha512",
-"filename": "jsshell.tar.xz",
-"unpack": true
-},
-{
-"version": "gcc 4.8.5",
-"size": 81065660,
-"digest": "db26f498ab56a3b5c65d7cda290cbb74174af9f2d021ca9c158f53b0382924ccf5ed9638d41eef449434aa9383a9113994d9729d9dd910321d1f35f9411eae38",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": true
-}
-]
--- a/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest
@@ -30,18 +30,18 @@
"filename": "java_home-1.7.0-openjdk-1.7.0.85.x86_64.tar.xz",
"unpack": true
},
{
"algorithm": "sha512",
"visibility": "public",
"filename": "jcentral.tar.xz",
"unpack": true,
-"digest": "b5d85a917785e1c034318f7495fef27a6274b04d8640245726b0cf1331b7ac374f5757868901c3fadd930bf10603173a706be653d769dde8ddfdb8673b143363",
-"size": 38596168
+"digest": "31a8c573f002e5f9a09c5ae4fd768bebb3ea29006c78bb1d353ccbb48be9dcaaeffaf8a32778f0bbb516bea3112c59067f5d17535f31cc7e8abfd8945b139642",
+"size": 38606248
},
{
"algorithm": "sha512",
"visibility": "public",
"filename": "gradle.tar.xz",
"unpack": true,
"digest": "ef1d0038da879cc6840fced87671f8f6a18c51375498804f64d21fa48d7089ded4da2be36bd06a1457083e9110e59c0884f1e074dc609d29617c131caea8f234",
"size": 50542140
--- a/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
@@ -39,10 +39,26 @@
},
{
"version": "gcc 4.8.5",
"size": 81065660,
"digest": "db26f498ab56a3b5c65d7cda290cbb74174af9f2d021ca9c158f53b0382924ccf5ed9638d41eef449434aa9383a9113994d9729d9dd910321d1f35f9411eae38",
"algorithm": "sha512",
"filename": "gcc.tar.xz",
"unpack": true
+},
+{
+"algorithm": "sha512",
+"visibility": "public",
+"filename": "jcentral.tar.xz",
+"unpack": true,
+"digest": "31a8c573f002e5f9a09c5ae4fd768bebb3ea29006c78bb1d353ccbb48be9dcaaeffaf8a32778f0bbb516bea3112c59067f5d17535f31cc7e8abfd8945b139642",
+"size": 38606248
+},
+{
+"algorithm": "sha512",
+"visibility": "public",
+"filename": "gradle.tar.xz",
+"unpack": true,
+"digest": "ef1d0038da879cc6840fced87671f8f6a18c51375498804f64d21fa48d7089ded4da2be36bd06a1457083e9110e59c0884f1e074dc609d29617c131caea8f234",
+"size": 50542140
}
]
--- a/mobile/android/config/tooltool-manifests/android/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android/releng.manifest
@@ -50,10 +50,26 @@
},
{
"size": 30899096,
"visibility": "public",
"digest": "ac9f5f95d11580d3dbeff87e80a585fe4d324b270dabb91b1165686acab47d99fa6651074ab0be09420239a5d6af38bb2c539506962a7b44e0ed4d080bba2953",
"algorithm": "sha512",
"filename": "java_home-1.7.0-openjdk-1.7.0.85.x86_64.tar.xz",
"unpack": true
+},
+{
+"algorithm": "sha512",
+"visibility": "public",
+"filename": "jcentral.tar.xz",
+"unpack": true,
+"digest": "31a8c573f002e5f9a09c5ae4fd768bebb3ea29006c78bb1d353ccbb48be9dcaaeffaf8a32778f0bbb516bea3112c59067f5d17535f31cc7e8abfd8945b139642",
+"size": 38606248
+},
+{
+"algorithm": "sha512",
+"visibility": "public",
+"filename": "gradle.tar.xz",
+"unpack": true,
+"digest": "ef1d0038da879cc6840fced87671f8f6a18c51375498804f64d21fa48d7089ded4da2be36bd06a1457083e9110e59c0884f1e074dc609d29617c131caea8f234",
+"size": 50542140
}
]