Bug fixes for Android major versions.

Author: Alexhuszagh

docker/android-system.sh

@@ -9,8 +9,24 @@ set -euo pipefail
 main() {
     local arch="${1}"
     local version="${ANDROID_VERSION}"
+    local major_version="${version//.*/}"
     local gcc_version=4.9
-    local glibc_version=glibc2.15-4.8
+    local glibc_version
+    case "${major_version}" in
+        4)
+            glibc_version=glibc2.7-4.6
+            ;;
+        5|6|7|8|9)
+            glibc_version=glibc2.15-4.8
+            ;;
+        10|11|12|13)
+            glibc_version=glibc2.17-4.8
+            ;;
+        *)
+            # current master branch as of 9/15/2022
+            glibc_version=glibc2.19-4.9
+            ;;
+    esac
     # FIXME: android is currently migrating from make to soong, so
     # `platform/build/make` may be missing from a future version of
     # android. version-gate this when make is removed.
@@ -70,7 +86,9 @@ EOF
         python3 ./repo sync -c build/make
     fi
     python3 ./repo sync -c build/blueprint
-    python3 ./repo sync -c build/soong
+    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
@@ -82,9 +100,13 @@ EOF
     python3 ./repo sync -c external/llvm
     python3 ./repo sync -c external/lzma
     python3 ./repo sync -c external/mksh
-    python3 ./repo sync -c external/safe-iop
-    python3 ./repo sync -c external/valgrind
-    python3 ./repo sync -c external/vixl
+    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
@@ -93,12 +115,16 @@ EOF
     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}"
-    python3 ./repo sync -c prebuilts/go/linux-x86
+    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
     python3 ./repo sync -c system/core
-    python3 ./repo sync -c system/libhidl
-    python3 ./repo sync -c system/tools/hidl
+    if [[ "${major_version}" -ge 8 ]]; then
+        python3 ./repo sync -c system/libhidl
+        python3 ./repo sync -c system/tools/hidl
+    fi
 
     case "${arch}" in
         arm)
@@ -116,14 +142,16 @@ EOF
         ;;
     esac
 
-    # avoid build tests
+    # avoid build tests. these can fail in newer versions, so allow failures.
+    set +e
     rm bionic/linker/tests/Android.mk
     rm bionic/tests/Android.mk
     rm bionic/tests/Android.bp
     rm bionic/benchmarks/Android.bp
     rm bionic/tests/libs/Android.bp
     rm bionic/tests/headers/Android.bp
     rm bionic/tests/headers/posix/Android.bp
+    set -e
 
     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