commit 7bf23427d4be61b844fcd6e34f57486985ca2e1a
author Martin Stjernholm <mast@google.com> Thu Feb 14 06:43:22 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Feb 14 06:43:22 2019 -0800
tree e28990664c5ebef49d500a2436784b1ae0838055
parent fa81f753115e1086b55d598627fc6bf729e6b135
parent 6fa73cf475305f93fa210e2b50bd2de4926121d2

Merge "Use new static target for libdexfile_support."
am: 612a6d6ba3

Change-Id: Iaca2a1c769598e1512f29b693b039b2446197f5b

debuggerd/Android.bp

diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp
index 4a53a33..76c5ade 100644
--- a/debuggerd/Android.bp
+++ b/debuggerd/Android.bp
@@ -115,19 +115,14 @@
         "libbase",
         "libdebuggerd",
         "libunwindstack",
-        "libdexfile",  // libunwindstack dependency
-        "libdexfile_external",  // libunwindstack dependency
-        "libdexfile_support",  // libunwindstack dependency
+        "libdexfile_support_static",  // libunwindstack dependency
         "liblzma",
         "libcutils",
     ],
     target: {
         recovery: {
             exclude_static_libs: [
-                "libartbase",
-                "libdexfile",
-                "libdexfile_external",
-                "libdexfile_support",
+                "libdexfile_support_static",
             ],
         },
     },
@@ -174,8 +169,7 @@
     include_dirs: ["bionic/libc"],
 
     static_libs: [
-        "libdexfile_external",  // libunwindstack dependency
-        "libdexfile_support",  // libunwindstack dependency
+        "libdexfile_support_static",  // libunwindstack dependency
         "libunwindstack",
         "liblzma",
         "libbase",
@@ -185,8 +179,7 @@
     target: {
         recovery: {
             exclude_static_libs: [
-                "libdexfile_external",
-                "libdexfile_support",
+                "libdexfile_support_static",
             ],
         },
     },