diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-02-26 17:19:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-26 17:19:42 +0000 |
| commit | 21c29cfadeb677acfe7b4669c7fe49d1c646f2a3 (patch) | |
| tree | 04dfdae0fa66951e4ff8262dc8834c38ae0fed5d | |
| parent | 89a7cc48cc7934c34627355b0fb01d913a9d27f0 (diff) | |
| parent | 852b64e5493c0c170ed17b0a4594b9f9f0de5cb2 (diff) | |
Merge "Fix libdexfile dependencies to avoid direct dependency on libdexfile_external."
| -rw-r--r-- | debuggerd/Android.bp | 4 | ||||
| -rw-r--r-- | libunwindstack/Android.bp | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp index 76c5adeec..0cf3378b1 100644 --- a/debuggerd/Android.bp +++ b/debuggerd/Android.bp @@ -218,13 +218,11 @@ cc_test { "liblog", "libminijail", "libnativehelper", + "libunwindstack", ], static_libs: [ "libdebuggerd", - "libdexfile_external", // libunwindstack dependency - "libdexfile_support", // libunwindstack dependency - "libunwindstack", ], local_include_dirs: [ diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp index c90f5b271..a49fd9ed4 100644 --- a/libunwindstack/Android.bp +++ b/libunwindstack/Android.bp @@ -95,7 +95,6 @@ cc_library { "DexFiles.cpp", ], exclude_shared_libs: [ - "libdexfile_external", "libdexfile_support", ], }, @@ -106,7 +105,6 @@ cc_library { "DexFiles.cpp", ], exclude_shared_libs: [ - "libdexfile_external", "libdexfile_support", ], }, @@ -137,7 +135,6 @@ cc_library { shared_libs: [ "libbase", - "libdexfile_external", "libdexfile_support", "liblog", "liblzma", |