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

am: bc43c7c05d

Change-Id: Iff52585c320e81883514b10753af095c3e434259
This commit is contained in:
Martin Stjernholm 2019-02-26 09:39:04 -08:00 committed by android-build-merger
commit 7c4b14fae3
2 changed files with 1 additions and 6 deletions

View file

@ -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: [

View file

@ -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",