diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp
index 5167481..d9fae52 100644
--- a/debuggerd/Android.bp
+++ b/debuggerd/Android.bp
@@ -116,21 +116,14 @@
         "libdebuggerd",
         "libbacktrace",
         "libunwindstack",
-        "libdexfile",  // libunwindstack dependency
-        "libdexfile_external",  // libunwindstack dependency
-        "libdexfile_support",  // libunwindstack dependency
+        "libdexfile",
         "liblzma",
         "libcutils",
     ],
     target: {
         recovery: {
             cflags: ["-DNO_LIBDEXFILE_SUPPORT"],
-            exclude_static_libs: [
-                "libartbase",
-                "libdexfile",
-                "libdexfile_external",
-                "libdexfile_support",
-            ],
+            exclude_static_libs: ["libdexfile"],
         },
     },
 
@@ -177,22 +170,12 @@
 
     static_libs: [
         "libbacktrace",
-        "libdexfile_external",  // libunwindstack dependency
-        "libdexfile_support",  // libunwindstack dependency
         "libunwindstack",
         "liblzma",
         "libbase",
         "libcutils",
         "liblog",
     ],
-    target: {
-        recovery: {
-            exclude_static_libs: [
-                "libdexfile_external",
-                "libdexfile_support",
-            ],
-        },
-    },
 }
 
 cc_test {
@@ -233,8 +216,6 @@
 
     static_libs: [
         "libdebuggerd",
-        "libdexfile_external",  // libunwindstack dependency
-        "libdexfile_support",  // libunwindstack dependency
         "libunwindstack",
     ],