Bug 1296335 - Update android-api-15-* mozconfig files to point to new gradle folder. r?Callek draft
authorSebastian Kaspari <s.kaspari@gmail.com>
Fri, 19 Aug 2016 16:14:14 +0200
changeset 403381 1004759c99205982fe28d33ebd4d2aade6a9af3d
parent 403380 570277ce4871b9f7655ae3fe0a14a47dee29f817
child 528897 f0ca7e7973e0fee58e06c9bf884241ec70dee950
push id26903
push users.kaspari@gmail.com
push dateFri, 19 Aug 2016 17:33:45 +0000
reviewersCallek
bugs1296335
milestone51.0a1
Bug 1296335 - Update android-api-15-* mozconfig files to point to new gradle folder. r?Callek MozReview-Commit-ID: 3iKKrXH4rJt
mobile/android/config/mozconfigs/android-api-15-frontend/nightly
mobile/android/config/mozconfigs/android-api-15-gradle/nightly
--- a/mobile/android/config/mozconfigs/android-api-15-frontend/nightly
+++ b/mobile/android/config/mozconfigs/android-api-15-frontend/nightly
@@ -9,17 +9,17 @@ MOZ_AUTOMATION_UPDATE_PACKAGING=0
 MOZ_AUTOMATION_UPLOAD=0
 MOZ_AUTOMATION_UPLOAD_SYMBOLS=0
 
 NO_CACHE=1
 NO_NDK=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
-ac_add_options --with-gradle="$topsrcdir/gradle/bin/gradle"
+ac_add_options --with-gradle="$topsrcdir/gradle-dist/bin/gradle"
 export GRADLE_MAVEN_REPOSITORY="file://$topsrcdir/jcentral"
 
 unset HOST_CC
 unset HOST_CXX
 
 ac_add_options --disable-compile-environment
 ac_add_options --disable-tests
 
--- a/mobile/android/config/mozconfigs/android-api-15-gradle/nightly
+++ b/mobile/android/config/mozconfigs/android-api-15-gradle/nightly
@@ -3,17 +3,17 @@
 ac_add_options --enable-profiling
 
 # Android
 ac_add_options --with-android-min-sdk=15
 ac_add_options --target=arm-linux-androideabi
 
 ac_add_options --with-branding=mobile/android/branding/nightly
 
-ac_add_options --with-gradle="$topsrcdir/gradle/bin/gradle"
+ac_add_options --with-gradle="$topsrcdir/gradle-dist/bin/gradle"
 export GRADLE_MAVEN_REPOSITORY="file://$topsrcdir/jcentral"
 
 # From here on, just like ../android-api-15/nightly.
 
 # This will overwrite the default of stripping everything and keep the symbol table.
 # This is useful for profiling with eideticker. See bug 788680
 STRIP_FLAGS="--strip-debug"