Minor android 8 changes.

Author: Alexhuszagh

docker/android-system.sh

@@ -10,8 +10,8 @@
 #   6.0: 23 (tested at NDK r21dm 6.0.1_r81)
 #   7.0: 24 (tested at NDK r21d, 7.0.0_r36)
 #   7.1: 25 (tested at NDK r21d, 7.1.2_r39, not supported)
-#   8.0: 26
-#   8.1: 27
+#   8.0: 26 (tested at NDK r21d, 8.0.0_r51) TODO
+#   8.1: 27 (tested at NDK r21d, 8.1.0_r81) TODO
 #   9.0: 28 (tested at NDK r21d and r25b)
 #   10.0: 29
 #   11.0: 30
@@ -91,10 +91,9 @@ main() {
             7)
                 android_repo_v7
                 ;;
-#            8)
-#                #android_repo_v8
-#                # TODO(ahuszagh) Here.
-#                ;;
+            8)
+                android_repo_v8
+                ;;
             9)
                 android_repo_v9
                 ;;
@@ -353,6 +352,75 @@ android_repo_v7() {
     ANDROID_MAJOR=7 python3 /remove_android_tests.py
 }
 
+# TODO: tested on 8.0.0_r51 (SDK 26)
+# TODO: tested on 8.1.0_r81 (SDK 2278.0.0_r516)
+android_repo_v8() {
+    sync bionic
+    sync build
+    sync build/make
+    sync build/blueprint
+    sync build/soong
+    sync external/boringssl
+    sync external/clang
+    sync external/compiler-rt
+    sync external/jemalloc
+    sync external/libcxx
+    sync external/libcxxabi
+    sync external/libnl
+    sync external/libunwind
+    sync external/libunwind_llvm
+    sync external/llvm
+    sync external/lzma
+    sync external/mksh
+    sync external/pcre
+    sync external/selinux
+    sync external/zlib
+    sync hardware/interfaces
+    sync hardware/libhardware
+    sync frameworks/native
+    sync libnativehelper
+    sync prebuilts/build-tools
+    sync prebuilts/clang/host/linux-x86
+    sync prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8
+    sync prebuilts/go/linux-x86
+    # needed for libnativehelper_compat_libc++
+    sync prebuilts/ndk
+    sync system/core
+    sync system/libfmq
+    sync system/libhidl
+    sync system/libhwbinder
+    sync system/media
+    sync system/tools/hidl
+    # TODO(ahuszagh) Android 8 is a mess
+
+    # avoid build tests
+    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 hardware/interfaces/tests/Android.bp
+    rm system/tools/hidl/test/Android.bp
+    # we don't need the relocation packer, and removing
+    # the unittests from it is a bit of work.
+    rm bionic/tools/relocation_packer/Android.bp
+    rm bionic/tools/relocation_packer/Android.mk
+
+    # extra utilities we don't need
+    rm frameworks/native/libs/vr/Android.bp
+    rm frameworks/native/services/Android.bp
+    rm frameworks/native/services/*/Android.bp
+    rm hardware/interfaces/automotive/Android.bp
+    rm hardware/interfaces/camera/Android.bp
+    rm system/libhidl/transport/Android.bp
+    rm system/media/alsa_utils/Android.bp
+    rm system/media/audio_route/Android.bp
+    rm system/media/audio_utils/tests/Android.bp
+    # TODO(ahuszagh) Need to remove the tests here
+
+    ANDROID_MAJOR=8 python3 /remove_android_tests.py
+}
+
 # tested on 9.0.0_r1 (SDK 28)
 android_repo_v9() {
     sync art

docker/remove_android_tests.py

@@ -13,21 +13,59 @@ def windows(sequence, count):
     for i in range(len(sequence) - count + 1):
         yield sequence[i:i + count]
 
-def process_blueprint(contents):
+def process_blueprint(contents, path):
+    gtest_paths = ['system/core/libmetricslogger/Android.bp']
+    subdir_test_paths = [
+        'system/media/audio_utils/Android.bp',
+        'system/tools/hidl/Android.bp',
+    ]
+    subdir_transport_paths = [
+        'system/libhidl/Android.bp',
+    ]
+    remove_gtest = (
+        os.environ.get('ANDROID_MAJOR') == '8' and
+        any(i in path for i in gtest_paths)
+    )
+    remove_subdir_test = (
+        os.environ.get('ANDROID_MAJOR') == '8' and
+        any(i in path for i in subdir_test_paths)
+    )
+    remove_subdir_transport = (
+        os.environ.get('ANDROID_MAJOR') == '8' and
+        any(i in path for i in subdir_transport_paths)
+    )
+
     result = []
     in_match = False
     for line in contents.splitlines():
-        if re.match(r'^cc_test\w*\s*{', line) or re.match(r'^java_test\w*\s*{', line):
+        if re.match(r'^cc_test\w*\s*{', line):
+            assert not in_match
+            in_match = True
+        elif re.match(r'^java_test\w*\s*{', line):
+            assert not in_match
+            in_match = True
+        elif re.match(r'^cc_benchmark\w*\s*{', line):
             assert not in_match
             in_match = True
         elif in_match and line.startswith('}'):
             in_match = False
+        elif not in_match and line.startswith('    name: "memtrack_test",'):
+            # bug fix for Android 8.0
+            assert not in_match
+            result.pop()
+            in_match = True
+        elif remove_gtest and not in_match and 'libgtest' in line:
+            pass
+        elif remove_subdir_test and not in_match and (line.startswith('    "test",') or line.startswith('subdirs = ["tests"]')):
+            pass
+        elif remove_subdir_transport and not in_match and (line.startswith('    "transport",') or line.startswith('subdirs = ["transport"]')):
+            pass
         elif not in_match:
             result.append(line)
 
     return '\n'.join(result)
 
-def process_makefile(contents):
+def process_makefile(contents, path):
     def is_test(title):
         return 'test' in title.lower()
 
@@ -58,7 +96,7 @@ def process_file(path, process_contents):
     with open(path + '.bak', 'w') as file:
         file.write(contents)
     with open(path, 'w') as file:
-        output = process_contents(contents)
+        output = process_contents(contents, path)
         file.write(output)
 
 def main():