[tor-commits] [tor-browser-build/master] Bug 31192 - Follow Mozilla for Android SDK config

[gk at torproject.org]

commit cb97c6e9fd52e4a3871c8a1c2f77a00911f7d0ac
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Thu Sep 26 17:07:06 2019 +0000

    Bug 31192 - Follow Mozilla for Android SDK config
---
 projects/firefox/mozconfig-android-aarch64 | 3 ++-
 projects/firefox/mozconfig-android-armv7   | 3 ++-
 projects/firefox/mozconfig-android-x86     | 3 ++-
 projects/firefox/mozconfig-android-x86_64  | 1 -
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/projects/firefox/mozconfig-android-aarch64 b/projects/firefox/mozconfig-android-aarch64
index f5c1474..3d997bc 100644
--- a/projects/firefox/mozconfig-android-aarch64
+++ b/projects/firefox/mozconfig-android-aarch64
@@ -4,6 +4,8 @@ export MOZILLA_OFFICIAL=1
 CC="clang"
 CXX="clang++"
 
+ac_add_options --with-android-min-sdk=21
+
 ac_add_options --enable-optimize
 ac_add_options --enable-official-branding
 
@@ -12,7 +14,6 @@ ac_add_options --target=aarch64-linux-android
 ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk
 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
 ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle
-ac_add_options --with-android-version=21
 
 ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
 ac_add_options --with-l10n-base=/var/tmp/dist/locales
diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7
index 75e1d78..2ef6138 100644
--- a/projects/firefox/mozconfig-android-armv7
+++ b/projects/firefox/mozconfig-android-armv7
@@ -4,6 +4,8 @@ export MOZILLA_OFFICIAL=1
 CC="clang"
 CXX="clang++"
 
+ac_add_options --with-android-min-sdk=16
+
 ac_add_options --enable-optimize
 ac_add_options --enable-official-branding
 
@@ -12,7 +14,6 @@ ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk
 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
 ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle
-ac_add_options --with-android-version=16
 
 ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
 ac_add_options --with-l10n-base=/var/tmp/dist/locales
diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86
index be1efd6..966ef3f 100644
--- a/projects/firefox/mozconfig-android-x86
+++ b/projects/firefox/mozconfig-android-x86
@@ -4,6 +4,8 @@ export MOZILLA_OFFICIAL=1
 CC="clang"
 CXX="clang++"
 
+ac_add_options --with-android-min-sdk=16
+
 ac_add_options --enable-optimize
 ac_add_options --enable-official-branding
 
@@ -12,7 +14,6 @@ ac_add_options --target=i686-linux-android
 ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk
 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
 ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle
-ac_add_options --with-android-version=16
 
 ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
 ac_add_options --with-l10n-base=/var/tmp/dist/locales
diff --git a/projects/firefox/mozconfig-android-x86_64 b/projects/firefox/mozconfig-android-x86_64
index 55bc883..17c3906 100644
--- a/projects/firefox/mozconfig-android-x86_64
+++ b/projects/firefox/mozconfig-android-x86_64
@@ -14,7 +14,6 @@ ac_add_options --target=x86_64-linux-android
 ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk
 ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
 ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.10.2/bin/gradle
-ac_add_options --with-android-version=21
 
 ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser
 ac_add_options --with-l10n-base=/var/tmp/dist/locales