Merge "Use new static target for libdexfile_support."
This commit is contained in:
commit
612a6d6ba3
|
@ -115,19 +115,14 @@ cc_library_static {
|
|||
"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 @@ cc_library_static {
|
|||
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 @@ cc_library_static {
|
|||
target: {
|
||||
recovery: {
|
||||
exclude_static_libs: [
|
||||
"libdexfile_external",
|
||||
"libdexfile_support",
|
||||
"libdexfile_support_static",
|
||||
],
|
||||
},
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue