Add support for Android 10.

Author: Alexhuszagh

docker/android-system.sh

@@ -96,6 +96,9 @@ EOF
         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
@@ -127,6 +130,8 @@ EOF
     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
@@ -135,18 +140,18 @@ EOF
         python3 ./repo sync -c system/tools/hidl
     fi
     if [[ "${major_version}" -ge 10 ]]; then
-        python3 ./repo sync -c system/libvintf
+        python3 ./repo sync -c external/libxml2
         python3 ./repo sync -c system/sepolicy
         python3 ./repo sync -c system/tools/xsdc
     fi
 
     case "${arch}" in
-        arm)
-            python3 ./repo sync "prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-${gcc_version}"
-        ;;
-        arm64)
+        arm|arm64)
+            python3 ./repo sync -c external/arm-optimized-routines
             python3 ./repo sync "prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-${gcc_version}"
-            python3 ./repo sync "prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-${gcc_version}"
+            if [[ "${arch}" == "arm64" ]]; then
+                python3 ./repo sync "prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-${gcc_version}"
+            fi
         ;;
         x86)
             python3 ./repo sync "prebuilts/gcc/linux-x86/x86/x86_64-linux-android-${gcc_version}"
@@ -165,14 +170,15 @@ EOF
     rm bionic/tests/libs/Android.bp
     rm bionic/tests/headers/Android.bp
     rm bionic/tests/headers/posix/Android.bp
-    rm system/libvintf/xsd/compatibilityMatrix/vts/Android.mk
-    rm system/libvintf/xsd/compatibilityMatrix/vts/Android.bp
 
     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
-    sed -i -z -e 's/cc_test_host {.*}//g' bionic/tools/relocation_packer/Android.bp
-    # TODO(ahuszagh) Need to remove the necessary tests that fail.
-    #python3 ./repo sync -c test/vts
+    if [[ "${major_version}" -le 9 ]]; then
+        sed -i -z -e 's/cc_test_host {.*}//g' bionic/tools/relocation_packer/Android.bp
+    fi
+    if [[ "${major_version}" -ge 10 ]]; then
+        sed -i -z -e 's/cc_test {.*}//g' bionic/linker/Android.bp
+    fi
     set -e
 
     export ALLOW_MISSING_DEPENDENCIES=true