Minor bug fixes for Android 7.

Author: Alexhuszagh

docker/android-system.sh

@@ -40,27 +40,7 @@ main() {
     td="$(mktemp -d)"
     pushd "${td}"
 
-    # fake java and javac, it is not necessary for what we build, but the build
-    # script asks for it
-    cat << EOF > /usr/bin/java
-#!/usr/bin/env bash
-echo "java version \"1.7.0\""
-echo "OpenJDK Runtime Environment (IcedTea 2.6.9)"
-echo "OpenJDK 64-Bit Server VM (build 24.131-b00, mixed mode)"
-EOF
-
-    cat << EOF > /usr/bin/javac
-#!/usr/bin/env bash
-echo "javac 1.7.0"
-EOF
-
-    chmod +x /usr/bin/java
-    chmod +x /usr/bin/javac
-
-    # more faking
-    export ANDROID_JAVA_HOME=/tmp
-    mkdir /tmp/lib/
-    touch /tmp/lib/tools.jar
+    fake_java "${major_version}"
 
     install_packages ca-certificates \
         curl \
@@ -98,10 +78,9 @@ EOF
             6)
                 android_repo_v6 "${arch}"
                 ;;
-#            7)
-#                #android_repo_v7 "${arch}"
-#                # TODO(ahuszagh) Here.
-#                ;;
+            7)
+                android_repo_v7 "${arch}"
+                ;;
 #            8)
 #                #android_repo_v8 "${arch}"
 #                # TODO(ahuszagh) Here.
@@ -143,6 +122,44 @@ EOF
     rm "${0}"
 }
 
+fake_java() {
+    local major_version="${1}"
+    local java_version=
+    local icedtea_version=
+    case "${major_version}" in
+        5|6)
+            java_version=1.7.0
+            icedtea_version=2.6.9
+            ;;
+        *)
+            java_version=1.8.0
+            icedtea_version=2.6.9
+            ;;
+    esac
+
+    # fake java and javac, it is not necessary for what we build, but the build
+    # script asks for it
+    cat << EOF > /usr/bin/java
+#!/usr/bin/env bash
+echo "java version \"${java_version}\""
+echo "OpenJDK Runtime Environment (IcedTea ${icedtea_version})"
+echo "OpenJDK 64-Bit Server VM (build 24.131-b00, mixed mode)"
+EOF
+
+    cat << EOF > /usr/bin/javac
+#!/usr/bin/env bash
+echo "javac ${java_version}"
+EOF
+
+    chmod +x /usr/bin/java
+    chmod +x /usr/bin/javac
+
+    # more faking
+    export ANDROID_JAVA_HOME=/tmp
+    mkdir /tmp/lib/
+    touch /tmp/lib/tools.jar
+}
+
 build_android() {
     local arch="${1}"
     local major_version="${2}"
@@ -282,16 +299,59 @@ android_repo_v6() {
     rm bionic/tools/relocation_packer/Android.mk
 }
 
-# TODO
+# TODO: tested on 7.0.0_r36 (SDK 24)
+# TODO: tested on 7.1.2_r39 (SDK 25)
 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.
+    sync build/kati
+    sync external/compiler-rt
+    sync external/elfutils
+    sync external/jemalloc
+    sync external/libcxx
+    sync external/libcxxabi
+    sync external/libunwind
+    sync external/libunwind_llvm
+    sync external/llvm
+    sync external/mksh
+    sync external/zlib
+    sync prebuilts/clang/host/linux-x86
+    sync prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8
+    sync prebuilts/ninja/linux-x86
+    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
+
+    python3 /remove_soong_tests.py
+
+    # FIXME: 7.0.0 Currently failing with:
+    # ninja: error: 'out/target/product/generic_arm64/obj/STATIC_LIBRARIES/libgtest_main_intermediates/export_includes', needed by 'out/target/product/generic_arm64/obj/EXECUTABLES/malloc_debug_unit_tests_intermediates/import_includes', missing and no known rule to make it
+    # make: *** [build/core/ninja.mk:149: ninja_wrapper] Error 1
 }
 
 # tested on 9.0.0_r1 (SDK 28)