Minor refactoring for build and added packages for Android 11.

Author: Alexhuszagh

docker/android-system.sh

@@ -1,4 +1,8 @@
 #!/usr/bin/env bash
+# The API level details are mentioned here:
+#   https://developer.android.com/studio/releases/platforms
+# These are controlled by `ANDROID_VERSION` and `ANDROID_SDK`,
+# for example, `ANDROID_SDK=30` and `ANDROID_VERSION=11.0.0_r48`.
 
 set -x
 set -euo pipefail
@@ -86,72 +90,81 @@ EOF
         python3 ./repo sync -c build/make
     fi
     python3 ./repo sync -c build/blueprint
-    if [[ "${major_version}" -ge 7 ]]; then
-        python3 ./repo sync -c build/soong
-    fi
     python3 ./repo sync -c external/clang
     python3 ./repo sync -c external/compiler-rt
     python3 ./repo sync -c external/elfutils
-    if [[ "${major_version}" -ge 10 ]]; then
-        python3 ./repo sync -c external/golang-protobuf
-    fi
     python3 ./repo sync -c external/jemalloc
-    if [[ "${major_version}" -ge 10 ]]; then
-        python3 ./repo sync -c external/jemalloc_new
-    fi
     python3 ./repo sync -c external/libcxx
     python3 ./repo sync -c external/libcxxabi
     python3 ./repo sync -c external/libunwind
     python3 ./repo sync -c external/libunwind_llvm
     python3 ./repo sync -c external/llvm
     python3 ./repo sync -c external/lzma
     python3 ./repo sync -c external/mksh
-    if [[ "${major_version}" -le 9 ]]; then
-        python3 ./repo sync -c external/safe-iop
-        python3 ./repo sync -c external/valgrind
-    fi
-    if [[ "${major_version}" -ge 5 ]]; then
-        python3 ./repo sync -c external/vixl
-    fi
     python3 ./repo sync -c external/zlib
     python3 ./repo sync -c frameworks/hardware/interfaces
     python3 ./repo sync -c hardware/interfaces
-    if [[ "${major_version}" -ge 10 ]]; then
-        python3 ./repo sync -c kernel/configs
-    fi
     python3 ./repo sync -c libnativehelper
     python3 ./repo sync -c prebuilts/build-tools
     python3 ./repo sync -c prebuilts/clang/host/linux-x86
     python3 ./repo sync -c prebuilts/clang-tools
     python3 ./repo sync -c "prebuilts/gcc/linux-x86/host/x86_64-linux-${glibc_version}"
-    if [[ "${major_version}" -ge 7 ]]; then
-        python3 ./repo sync -c prebuilts/go/linux-x86
-    fi
     python3 ./repo sync -c prebuilts/misc
     python3 ./repo sync -c prebuilts/sdk
-    if [[ "${major_version}" -ge 10 ]]; then
-        python3 ./repo sync -c external/icu
-        python3 ./repo sync -c prebuilts/ndk
-        python3 ./repo sync -c prebuilts/vndk/v28
-    fi
     python3 ./repo sync -c system/core
+
+    if [[ "${major_version}" -le 9 ]]; then
+        python3 ./repo sync -c external/safe-iop
+        python3 ./repo sync -c external/valgrind
+    fi
+    if [[ "${major_version}" -ge 5 ]]; then
+        python3 ./repo sync -c external/vixl
+    fi
+    if [[ "${major_version}" -ge 7 ]]; then
+        python3 ./repo sync -c prebuilts/go/linux-x86
+        python3 ./repo sync -c build/soong
+    fi
     if [[ "${major_version}" -ge 8 ]]; then
         python3 ./repo sync -c system/libhidl
         python3 ./repo sync -c system/tools/hidl
     fi
     if [[ "${major_version}" -ge 10 ]]; then
+        python3 ./repo sync -c kernel/configs
         python3 ./repo sync -c external/libxml2
         python3 ./repo sync -c system/sepolicy
         python3 ./repo sync -c system/tools/xsdc
+        python3 ./repo sync -c external/golang-protobuf
+        python3 ./repo sync -c external/jemalloc_new
+        python3 ./repo sync -c external/icu
+        python3 ./repo sync -c prebuilts/ndk
+        python3 ./repo sync -c prebuilts/vndk/v28
+    fi
+    if [[ "${major_version}" -ge 11 ]]; then
+        python3 ./repo sync -c prebuilts/vndk/v29
+        python3 ./repo sync -c system/hardware/interfaces
+        python3 ./repo sync -c system/tools/aidl
+        python3 ./repo sync -c system/libvintf
+        python3 ./repo sync -c tools/metalava
+        python3 ./repo sync -c libcore
+        python3 ./repo sync -c bootable/recovery
+        python3 ./repo sync -c system/apex
+        python3 ./repo sync -c external/avb
+        python3 ./repo sync -c external/e2fsprogs
+        python3 ./repo sync -c external/selinux
+        python3 ./repo sync -c external/conscrypt
+        python3 ./repo sync -c external/sqlite
+        python3 ./repo sync -c prebuilts/python/linux-x86/2.7.5
     fi
 
     case "${arch}" in
         arm|arm64)
-            python3 ./repo sync -c external/arm-optimized-routines
             python3 ./repo sync "prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-${gcc_version}"
             if [[ "${arch}" == "arm64" ]]; then
                 python3 ./repo sync "prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-${gcc_version}"
             fi
+            if [[ "${major_version}" -ge 10 ]]; then
+                python3 ./repo sync -c external/arm-optimized-routines
+            fi
         ;;
         x86)
             python3 ./repo sync "prebuilts/gcc/linux-x86/x86/x86_64-linux-android-${gcc_version}"
@@ -170,6 +183,12 @@ EOF
     rm bionic/tests/libs/Android.bp
     rm bionic/tests/headers/Android.bp
     rm bionic/tests/headers/posix/Android.bp
+    if [[ "${major_version}" -ge 11 ]]; then
+        rm system/libvintf/xsd/halManifest/vts/Android.bp
+        rm system/libvintf/xsd/halManifest/vts/Android.mk
+        rm system/libvintf/xsd/compatibilityMatrix/vts/Android.bp
+        rm system/libvintf/xsd/compatibilityMatrix/vts/Android.mk
+    fi
 
     sed -i -z -e 's/cc_test {.*}//g' bionic/libc/malloc_debug/Android.bp
     sed -i -z -e 's/cc_test {.*}//g' bionic/libc/malloc_hooks/Android.bp