Bug 1290305 - Do not pass --with-android-version in mobile/android/config/mozconfigs/common. r=glandium draft
authorChris Manchester <cmanchester@mozilla.com>
Mon, 01 Aug 2016 11:16:57 -0700
changeset 395010 ef6ee2643fb7935f8f4e8e947ea9b71c2f4314b9
parent 393304 fef429fba4c64c5b9c0c823a6ab713edbbcd4220
child 526935 9b29780ab19b6330c918fb7c0a6633f8ba5ec4d6
push id24703
push usercmanchester@mozilla.com
push dateMon, 01 Aug 2016 18:19:57 +0000
reviewersglandium
bugs1290305
milestone50.0a1
Bug 1290305 - Do not pass --with-android-version in mobile/android/config/mozconfigs/common. r=glandium The value passed is already the default. A recent change makes this argument unrecognized for --disable-compile-environment builds, so this argument may cause an error. MozReview-Commit-ID: 4b966AKzkp9
mobile/android/config/mozconfigs/common
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -39,17 +39,16 @@ ANDROID_NDK_VERSION_32BIT="r8c"
 ac_add_options --enable-application=mobile/android
 ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux"
 
 if [ -z "$NO_NDK" ]; then
     ac_add_options --with-android-ndk="$topsrcdir/android-ndk"
     ac_add_options --with-android-gnu-compiler-version=4.9
 fi
 
-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
 
 ac_add_options --with-mozilla-api-keyfile=/builds/mozilla-fennec-geoloc-api.key