commit c9bc2c6af7f6f91648cca7488295c2624f7704df
author Alex Light <allight@google.com> Wed Feb 03 19:08:42 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 03 19:08:42 2021 +0000
tree 9108b9c957b0ea3485fccc00ed992bcd0e6f9af8
parent cf9f578f8a70031dc565f599ee90c26c6ec85b85
parent 083ec3543e9e1999a232ea9abcfbf4f725a27700

Fix DDMS-JDWP race am: f51d182c3d am: eb9ae68543 am: 083ec3543e

Original change: https://android-review.googlesource.com/c/platform/art/+/1569323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf97bb82bdf338e1f39e36398339f92efdefd129

build/apex/Android.bp

diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 8d985b3..78770db 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -72,6 +72,8 @@
 
 bionic_binaries_both = [
     "linker",
+    // To validate the zip file generated by cloud server.
+    "ziptool",
 ]
 
 // - Debug variants (binaries for which a 32-bit version is preferred on device, but for which

test/Android.bp

diff --git a/test/Android.bp b/test/Android.bp
index 5a458d2..e81645e 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -228,7 +228,7 @@
     },
     test_suites: [
         "general-tests",
-        "mts",
+        "mts-art",
     ],
     host_required: [
         "art-run-test-checker",
@@ -1025,7 +1025,7 @@
     // It seems that only device-tests build can create a valid apex.
     test_suites: [
         "device-tests",
-        "mts",
+        "mts-art",
     ],
     test_config: "art-gtests-target-install-apex.xml",