Initial Android 6 support.

Author: Alexhuszagh

docker/android-system.sh

@@ -6,8 +6,8 @@
 #
 # The versions are:
 #   5.0: 21 (tested at NDK r13b)
-#   5.1: 22 (tested at NDK r21d, unused DT entry warnings)
-#   6.0: 23
+#   5.1: 22 (tested at NDK r21d, unused DT)
+#   6.0: 23 (tested at NDK r21d, unused DT)
 #   7.0: 24
 #   7.1: 25
 #   8.0: 26
@@ -28,7 +28,7 @@ main() {
     local arch="${1}"
     local version="${ANDROID_VERSION}"
     local major_version="${version//.*/}"
-    export ANDROID_TAG="android-${version}"
+    local tag="android-${version}"
 
     if [[ "${ANDROID_SYSTEM_COMPLETE}" != "1" ]] && [[ "${major_version}" -ge "12" ]]; then
         echo "Only minimal Android builds for versions 11 or lower are supported" 1>&2
@@ -76,11 +76,9 @@ EOF
         xz-utils
     purge_list+=(default-jre)
 
-#    curl --retry 3 -sSfL https://storage.googleapis.com/git-repo-downloads/repo -O
-#    chmod +x repo
-#
-#    # TODO(ahuszagh) Add --depth 1
-#    python3 ./repo init -u "https://android.googlesource.com/platform/manifest" -b "android-${version}"
+    curl --retry 3 -sSfL https://storage.googleapis.com/git-repo-downloads/repo -O
+    chmod +x repo
+    python3 ./repo init -u https://android.googlesource.com/platform/manifest -b "${tag}"
 
     local tools=(
         cat chmod chown cmp cp ctrlaltdel date df dmesg du hd id ifconfig
@@ -97,10 +95,9 @@ EOF
                 android_repo_v5 "${arch}"
                 tools+=(dd getevent getprop grep newfs_msdos)
                 ;;
-#            6)
-#                #android_repo_v6 "${arch}"
-#                # TODO(ahuszagh) Here.
-#                ;;
+            6)
+                android_repo_v6 "${arch}"
+                ;;
 #            7)
 #                #android_repo_v7 "${arch}"
 #                # TODO(ahuszagh) Here.
@@ -162,25 +159,20 @@ build_android() {
         # FIXME: Currently failing on Android 10 with:
         # FAILED: ninja: 'out/soong/missing', needed by 'out/soong/generic_arm64/dex_bootjars_input/android.test.base.jar', missing and no known rule to make it
         # 23:31:18 ninja failed with: exit status 1
-        mmma system/apex/
+        mmma art/build/apex
     fi
 
     set -u
 }
 
 install_android() {
     local arch="${1}"
-    local srcdir=
     shift
 
     if [[ "${arch}" = "arm" ]]; then
-        srcdir=out/target/product/generic
+        mv out/target/product/generic/system/ /
     else
-        srcdir="out/target/product/generic_${arch}"
-    fi
-    mv "${srcdir}/system" /
-    if [[ "${major_version}" -ge 10 ]]; then
-        mv "${srcdir}/apex" /
+        mv "out/target/product/generic_${arch}/system"/ /
     fi
 
     # list from https://elinux.org/Android_toolbox
@@ -197,19 +189,12 @@ install_android() {
 # set of modules required for each android version, starting with
 # a minimal number of dependencies.
 
-sync() {
-    local path="${1}"
-    local url=https://android.googlesource.com/platform
-    mkdir -p "${path}"
-    git clone "${url}/${path}" "${path}" --branch "${ANDROID_TAG}" --depth 1
-    #python3 ./repo sync -c --no-clone-bundle "${@}"
-}
-
 android_repo_complete() {
-    sync
+    python3 ./repo sync -c
 }
 
 # tested on 5.0.0_r1 (SDK 21)
+# tested on 5.1.1_r38 (SDK 22)
 android_repo_v5() {
     local arch="${1}"
 
@@ -252,14 +237,71 @@ android_repo_v5() {
     sed -i -e 's/if (!kernel_supplied_AT_SECURE)/if (false)/g' bionic/linker/linker_environ.cpp
 }
 
+# tested on 6.0.1_r81 (SDK 23)
+android_repo_v6() {
+    local arch="${1}"
+
+    sync bionic
+    sync build
+    sync external/compiler-rt
+    sync external/libcxx
+    sync external/libcxxabi
+    sync external/elfutils
+    sync external/jemalloc
+    sync external/mksh
+    sync external/safe-iop
+    sync external/zlib
+    sync libnativehelper
+    sync prebuilts/clang/linux-x86/host/3.6
+    sync prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8
+    sync prebuilts/misc
+    sync system/core
+
+    case "${arch}" in
+        arm)
+            sync prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9
+        ;;
+        arm64)
+            sync prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9
+            sync prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9
+        ;;
+        x86)
+            sync prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9
+        ;;
+        x86_64)
+            sync prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9
+        ;;
+    esac
+
+    # avoid build tests
+    rm bionic/linker/tests/Android.mk
+    rm bionic/tests/Android.mk
+    rm bionic/benchmarks/Android.mk
+    # we don't need the relocation packer, and removing
+    # the unittests from it is a bit of work.
+    rm bionic/tools/relocation_packer/Android.mk
+}
+
+# TODO
+android_repo_v7() {
+    # TODO(ahuszagh) This is the first one using the soong build system
+    local arch="${1}"
+
+    sync bionic
+    sync build
+    sync prebuilts/clang/linux-x86/host/3.6
+    # TODO(ahuszagh) Here...
+    # TODO(ahuszagh) Having issues rn with using git directly.
+}
+
 # tested on 9.0.0_r1 (SDK 28)
 android_repo_v9() {
     local arch="${1}"
 
     sync art
     sync bionic
-    sync build/blueprint
     sync build/make
+    sync build/blueprint
     sync build/soong
     sync external/clang
     sync external/compiler-rt
@@ -280,8 +322,8 @@ android_repo_v9() {
     sync hardware/interfaces
     sync libnativehelper
     sync prebuilts/build-tools
-    sync prebuilts/clang-tools
     sync prebuilts/clang/host/linux-x86
+    sync prebuilts/clang-tools
     sync prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8
     sync prebuilts/go/linux-x86
     sync prebuilts/misc
@@ -327,17 +369,9 @@ android_repo_v10() {
     sync build/make
     sync build/blueprint
     sync build/soong
-    sync external/apache-xml
-    sync external/avb
-    sync external/boringssl
-    sync external/bouncycastle
     sync external/clang
     sync external/compiler-rt
-    sync external/conscrypt
-    sync external/e2fsprogs
     sync external/elfutils
-    sync external/expat
-    sync external/icu
     sync external/jemalloc
     sync external/jemalloc_new
     sync external/libcxx
@@ -347,24 +381,12 @@ android_repo_v10() {
     sync external/llvm
     sync external/lzma
     sync external/mksh
-    sync external/pcre
-    sync external/protobuf
-    sync external/python/cpython2
-    sync external/python/six
-    sync external/robolectric-shadows
-    sync external/selinux
-    sync external/sqlite
     sync external/turbine
     sync external/vixl
     sync external/zlib
-    sync external/zopfli
-    sync prebuilts/jdk/jdk8
     sync prebuilts/jdk/jdk9
     sync external/golang-protobuf
-    sync frameworks/base
     sync frameworks/hardware/interfaces
-    sync frameworks/opt/setupwizard
-    sync libcore
     sync libnativehelper
     sync prebuilts/go/linux-x86
     sync prebuilts/build-tools
@@ -381,9 +403,6 @@ android_repo_v10() {
     sync system/libhidl
     sync system/tools/aidl
     sync system/tools/hidl
-    sync system/tools/xsdc
-    sync tools/apksig
-    sync tools/metalava
 
     case "${arch}" in
         arm)
@@ -411,15 +430,11 @@ android_repo_v10() {
     rm bionic/tests/headers/Android.bp
     rm bionic/tests/headers/posix/Android.bp
 
-    #rm frameworks/base/core/xsd/vts/Android.mk
-    #rm frameworks/base/packages/SettingsLib/tests/robotests/Android.mk
-    # include test/vts/tools/build/Android.host_config.mk
-
     python3 /remove_soong_tests.py
-    sed -i -z -e 's/include test\/vts\/tools\/build\/Android.host_config\.mk//g' frameworks/base/services/core/xsd/vts/Android.mk
-    #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 {.*}//g' bionic/linker/Android.bp
+}
+
+sync() {
+    python3 ./repo sync -c --no-clone-bundle "${1}"
 }
 
 # TODO(ahuszagh) Remove this