6 files changed, 8 insertions, 42 deletions
diff --git a/tools/cpp-define-generator/Android.bp b/tools/cpp-define-generator/Android.bp
index 57c9c095f8..f3342d39f6 100644
--- a/tools/cpp-define-generator/Android.bp
+++ b/tools/cpp-define-generator/Android.bp
@@ -28,7 +28,10 @@ cc_binary { // Do not use art_cc_binary because HOST_PREFER_32_BIT is incompatib
         "art_debug_defaults",
         "art_defaults",
     ],
-    include_dirs: ["art/runtime"],
+    include_dirs: [
+        "art/libdexfile",
+        "art/runtime",
+    ],
     srcs: ["main.cc"],
     shared_libs: [
         "libbase",
diff --git a/tools/external_oj_libjdwp_art_failures.txt b/tools/external_oj_libjdwp_art_failures.txt
index 828c0aac0f..6c2206fe46 100644
--- a/tools/external_oj_libjdwp_art_failures.txt
+++ b/tools/external_oj_libjdwp_art_failures.txt
@@ -53,25 +53,6 @@
            "org.apache.harmony.jpda.tests.jdwp.VirtualMachine.CapabilitiesNewTest#testCapabilitiesNew001" ]
 },
 {
-  description: "Test is flaky",
-  result: EXEC_FAILED,
-  bug: 69121056,
-  name: "org.apache.harmony.jpda.tests.jdwp.ObjectReference.IsCollectedTest#testIsCollected001"
-},
-{
-  description: "Test is flaky",
-  result: EXEC_FAILED,
-  bug: 70958370,
-  names: [ "org.apache.harmony.jpda.tests.jdwp.ObjectReference.EnableCollectionTest#testEnableCollection001",
-           "org.apache.harmony.jpda.tests.jdwp.MultiSession.EnableCollectionTest#testEnableCollection001" ]
-},
-{
-  description: "Test crashes",
-  result: EXEC_FAILED,
-  bug: 69591477,
-  name: "org.apache.harmony.jpda.tests.jdwp.VirtualMachine.ExitTest#testExit001"
-},
-{
   description: "Test times out on fugu-debug",
   result: EXEC_FAILED,
   bug: 70459916,
diff --git a/tools/hiddenapi/Android.bp b/tools/hiddenapi/Android.bp
index f9824f1fa3..af87d31e53 100644
--- a/tools/hiddenapi/Android.bp
+++ b/tools/hiddenapi/Android.bp
@@ -30,7 +30,6 @@ cc_defaults {
     },
 
     shared_libs: [
-        "libdexfile",
         "libbase",
     ],
 }
@@ -40,6 +39,7 @@ art_cc_binary {
     defaults: ["hiddenapi-defaults"],
     shared_libs: [
         "libart",
+        "libdexfile",
     ],
 }
 
@@ -51,6 +51,7 @@ art_cc_binary {
     ],
     shared_libs: [
         "libartd",
+        "libdexfiled",
     ],
 }
 
diff --git a/tools/prebuilt_libjdwp_art_failures.txt b/tools/prebuilt_libjdwp_art_failures.txt
index a9d268de0a..2664560455 100644
--- a/tools/prebuilt_libjdwp_art_failures.txt
+++ b/tools/prebuilt_libjdwp_art_failures.txt
@@ -102,28 +102,9 @@
            "org.apache.harmony.jpda.tests.jdwp.VirtualMachine.CapabilitiesNewTest#testCapabilitiesNew001" ]
 },
 {
-  description: "Test is flaky",
-  result: EXEC_FAILED,
-  bug: 69121056,
-  name: "org.apache.harmony.jpda.tests.jdwp.ObjectReference.IsCollectedTest#testIsCollected001"
-},
-{
   description: "Test for ddms extensions that are not implemented for prebuilt-libjdwp",
   result: EXEC_FAILED,
   bug: 69169846,
   name: "org.apache.harmony.jpda.tests.jdwp.DDM.DDMTest#testChunk001"
 },
-{
-  description: "Test is flakey",
-  result: EXEC_FAILED,
-  bug: 70958370,
-  names: [ "org.apache.harmony.jpda.tests.jdwp.ObjectReference.EnableCollectionTest#testEnableCollection001",
-           "org.apache.harmony.jpda.tests.jdwp.MultiSession.EnableCollectionTest#testEnableCollection001" ]
-},
-{
-  description: "Test crashes",
-  result: EXEC_FAILED,
-  bug: 69591477,
-  name: "org.apache.harmony.jpda.tests.jdwp.VirtualMachine.ExitTest#testExit001"
-}
 ]
diff --git a/tools/public.libraries.buildbot.txt b/tools/public.libraries.buildbot.txt
index 734fd1e50b..de636a813a 100644
--- a/tools/public.libraries.buildbot.txt
+++ b/tools/public.libraries.buildbot.txt
@@ -1,6 +1,7 @@
 libart.so
 libartd.so
 libdexfile.so
+libdexfiled.so
 libbacktrace.so
 libc.so
 libc++.so
diff --git a/tools/titrace/Android.bp b/tools/titrace/Android.bp
index 097622e756..21f266c087 100644
--- a/tools/titrace/Android.bp
+++ b/tools/titrace/Android.bp
@@ -40,9 +40,8 @@ cc_defaults {
     },
     header_libs: [
         "libopenjdkjvmti_headers",
-        "libart_runtime_headers", // for dex_instruction_list.h only
-        // "libbase_headers",
     ],
+    include_dirs: ["art/libdexfile"], // for dex_instruction_list.h only
     multilib: {
         lib32: {
             suffix: "32",