Bug 1820295 - Increase GeckoView Lite's minimum API level to 21. r=geckoview-reviewers,firefox-build-system-reviewers,nalexander,owlish

Actually, Fenix's minimum is 21 even if 32-bit and  Google Play Service has
discontinued 4.4 support. We would like to increase Lite's minimum API to 21
even if 32-bit.

Differential Revision: https://phabricator.services.mozilla.com/D187861

build/moz.configure/android-ndk.configure

@@ -33,12 +33,10 @@ option(
 )
 
 
-@depends(target)
-def min_android_version(target):
-    if target.cpu in ["aarch64", "x86_64"]:
-        # 64-bit support was added in API 21.
-        return "21"
-    return "16"
+@dependable
+def min_android_version():
+    # Sync with android_sdk_version
+    return "21"
 
 
 option(

build/moz.configure/android-sdk.configure

@@ -46,9 +46,9 @@ def android_sdk_root(value):
     )
 
 
-@depends("--enable-geckoview-lite")
-def android_sdk_version(geckoview_lite):
-    # We support Android SDK version 21 and up by default (16 in lite mode).
+@dependable
+def android_sdk_version():
+    # We support Android SDK version 21 and up by default.
     # See the --enable-android-min-sdk option below.
     #
     # Warning: Before increasing the with-android-min-sdk value, please note several places in
@@ -60,7 +60,7 @@ def android_sdk_version(geckoview_lite):
     return namespace(
         build_tools_version="33.0.1",
         target_sdk_version="33",
-        min_sdk_version="16" if geckoview_lite else "21",
+        min_sdk_version="21",
     )
 
 

taskcluster/scripts/misc/build-llvm-common.sh

@@ -29,12 +29,6 @@ x86_64-apple-darwin)
   arch=x86_64
   export MACOSX_DEPLOYMENT_TARGET=10.12
   ;;
-armv7-linux-android|i686-linux-android)
-  api_level=16
-  ;;
-aarch64-linux-android|x86_64-linux-android)
-  api_level=21
-  ;;
 esac
 
 case "$target" in
@@ -75,6 +69,7 @@ case "$target" in
     arch=${target%-linux-android}
     ;;
   esac
+  api_level=21
   target=$target$api_level
   # These flags are only necessary to pass the cmake tests. They don't end up
   # actually using libgcc, so use an empty library instead of trying to find