commit 302ce312ad266b35bca7c69d798966d1bd9dee5e
author Martin Stjernholm <mast@google.com> Tue Feb 26 09:34:52 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Feb 26 09:34:52 2019 -0800
tree d6f13521fd47492b19b52763934df66c98686370
parent b79c605d7f408752bcbf207c48499c240f2d5609
parent 32dbca16332c098083e698caea6289e88af78800

Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external." am: 21c29cfade
am: e6ab117292

Change-Id: I564f0e3a18a9b6f0842303fdc6ce8ea76277e3c5

debuggerd/Android.bp

diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp
index 76c5ade..0cf3378 100644
--- a/debuggerd/Android.bp
+++ b/debuggerd/Android.bp
@@ -218,13 +218,11 @@
         "liblog",
         "libminijail",
         "libnativehelper",
+        "libunwindstack",
     ],
 
     static_libs: [
         "libdebuggerd",
-        "libdexfile_external",  // libunwindstack dependency
-        "libdexfile_support",  // libunwindstack dependency
-        "libunwindstack",
     ],
 
     local_include_dirs: [

libunwindstack/Android.bp

diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp
index c90f5b2..a49fd9e 100644
--- a/libunwindstack/Android.bp
+++ b/libunwindstack/Android.bp
@@ -95,7 +95,6 @@
                 "DexFiles.cpp",
             ],
             exclude_shared_libs: [
-                "libdexfile_external",
                 "libdexfile_support",
             ],
         },
@@ -106,7 +105,6 @@
                 "DexFiles.cpp",
             ],
             exclude_shared_libs: [
-                "libdexfile_external",
                 "libdexfile_support",
             ],
         },
@@ -137,7 +135,6 @@
 
     shared_libs: [
         "libbase",
-        "libdexfile_external",
         "libdexfile_support",
         "liblog",
         "liblzma",