Add tentative support for complete Android builds.

Alexhuszagh · Alexhuszagh · commit 7509fc268fda · 2022-09-26T11:02:06.000-05:00
diff --git a/docker/Dockerfile.aarch64-linux-android b/docker/Dockerfile.aarch64-linux-android
@@ -16,6 +16,7 @@ RUN /qemu.sh aarch64
 ARG ANDROID_NDK=r21d
 ARG ANDROID_SDK=28
 ARG ANDROID_VERSION=9.0.0_r1
+ARG ANDROID_SYSTEM_COMPLETE=0
 
 COPY android-ndk.sh /
 RUN /android-ndk.sh arm64
diff --git a/docker/Dockerfile.arm-linux-androideabi b/docker/Dockerfile.arm-linux-androideabi
@@ -16,6 +16,7 @@ RUN /qemu.sh arm
 ARG ANDROID_NDK=r21d
 ARG ANDROID_SDK=28
 ARG ANDROID_VERSION=9.0.0_r1
+ARG ANDROID_SYSTEM_COMPLETE=0
 
 COPY android-ndk.sh /
 RUN /android-ndk.sh arm
diff --git a/docker/Dockerfile.armv7-linux-androideabi b/docker/Dockerfile.armv7-linux-androideabi
@@ -16,6 +16,7 @@ RUN /qemu.sh arm
 ARG ANDROID_NDK=r21d
 ARG ANDROID_SDK=28
 ARG ANDROID_VERSION=9.0.0_r1
+ARG ANDROID_SYSTEM_COMPLETE=0
 
 COPY android-ndk.sh /
 RUN /android-ndk.sh arm
diff --git a/docker/Dockerfile.i686-linux-android b/docker/Dockerfile.i686-linux-android
@@ -24,6 +24,7 @@ RUN /qemu.sh i386
 ARG ANDROID_NDK=r21d
 ARG ANDROID_SDK=28
 ARG ANDROID_VERSION=9.0.0_r1
+ARG ANDROID_SYSTEM_COMPLETE=0
 
 COPY android-ndk.sh /
 RUN /android-ndk.sh x86
diff --git a/docker/Dockerfile.thumbv7neon-linux-androideabi b/docker/Dockerfile.thumbv7neon-linux-androideabi
@@ -16,6 +16,7 @@ RUN /qemu.sh arm
 ARG ANDROID_NDK=r21d
 ARG ANDROID_SDK=28
 ARG ANDROID_VERSION=9.0.0_r1
+ARG ANDROID_SYSTEM_COMPLETE=0
 
 COPY android-ndk.sh /
 RUN /android-ndk.sh arm
diff --git a/docker/Dockerfile.x86_64-linux-android b/docker/Dockerfile.x86_64-linux-android
@@ -17,6 +17,7 @@ RUN /qemu.sh x86_64
 ARG ANDROID_NDK=r21d
 ARG ANDROID_SDK=28
 ARG ANDROID_VERSION=9.0.0_r1
+ARG ANDROID_SYSTEM_COMPLETE=0
 
 COPY android-ndk.sh /
 RUN /android-ndk.sh x86_64
diff --git a/docker/android-system.sh b/docker/android-system.sh
@@ -80,131 +80,135 @@ EOF
     curl --retry 3 -sSfL https://storage.googleapis.com/git-repo-downloads/repo -O
     chmod +x repo
 
-    # this is the minimum set of modules that are need to build bionic
-    # this was created by trial and error
     python3 ./repo init -u "https://android.googlesource.com/platform/manifest" -b "android-${version}"
 
-    python3 ./repo sync -c art
-    python3 ./repo sync -c bionic
-    if [[ "${has_make}" == 1 ]]; then
-        python3 ./repo sync -c build/make
-    fi
-    python3 ./repo sync -c build/blueprint
-    python3 ./repo sync -c external/clang
-    python3 ./repo sync -c external/compiler-rt
-    python3 ./repo sync -c external/elfutils
-    python3 ./repo sync -c external/jemalloc
-    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
-    python3 ./repo sync -c external/zlib
-    python3 ./repo sync -c frameworks/hardware/interfaces
-    python3 ./repo sync -c hardware/interfaces
-    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}"
-    python3 ./repo sync -c prebuilts/misc
-    python3 ./repo sync -c prebuilts/sdk
-    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 "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}"
-        ;;
-        x86_64)
-            python3 ./repo sync "prebuilts/gcc/linux-x86/x86/x86_64-linux-android-${gcc_version}"
-        ;;
-    esac
-
-    # 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
-    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
-    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
+    if [[ "${ANDROID_SYSTEM_COMPLETE}" == "1" ]]; then
+        python3 ./repo sync -c
+    else
+        # this is the minimum set of modules that are need to build bionic
+        # this was created by trial and error
+        python3 ./repo sync -c art
+        python3 ./repo sync -c bionic
+        if [[ "${has_make}" == 1 ]]; then
+            python3 ./repo sync -c build/make
+        fi
+        python3 ./repo sync -c build/blueprint
+        python3 ./repo sync -c external/clang
+        python3 ./repo sync -c external/compiler-rt
+        python3 ./repo sync -c external/elfutils
+        python3 ./repo sync -c external/jemalloc
+        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
+        python3 ./repo sync -c external/zlib
+        python3 ./repo sync -c frameworks/hardware/interfaces
+        python3 ./repo sync -c hardware/interfaces
+        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}"
+        python3 ./repo sync -c prebuilts/misc
+        python3 ./repo sync -c prebuilts/sdk
+        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 external/python/cpython2
+        fi
+
+        case "${arch}" in
+            arm|arm64)
+                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}"
+            ;;
+            x86_64)
+                python3 ./repo sync "prebuilts/gcc/linux-x86/x86/x86_64-linux-android-${gcc_version}"
+            ;;
+        esac
+
+        # 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
+        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
+        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
+
+        # patch the linker to avoid the error
+        # FATAL: kernel did not supply AT_SECURE
+        #sed -i -e 's/if (!kernel_supplied_AT_SECURE)/if (false)/g' bionic/linker/linker_environ.cpp
     fi
-    set -e
-
-    export ALLOW_MISSING_DEPENDENCIES=true
-
-    # patch the linker to avoid the error
-    # FATAL: kernel did not supply AT_SECURE
-    #sed -i -e 's/if (!kernel_supplied_AT_SECURE)/if (false)/g' bionic/linker/linker_environ.cpp
 
     set +u
     # shellcheck disable=SC1091
