Merge "Use shared lib of libutils, libz and libbase." am: 4bf9c82857 am: 70f6d5878e
am: 3b00f1cc8f
Change-Id: I2b521fd2f7b275a10d230318189704730cac8f90
This commit is contained in:
commit
da100377b0
2 changed files with 5 additions and 3 deletions
|
|
@ -9,8 +9,8 @@ cc_library {
|
||||||
"liblog",
|
"liblog",
|
||||||
"libcutils",
|
"libcutils",
|
||||||
"libnativebridge",
|
"libnativebridge",
|
||||||
|
"libbase",
|
||||||
],
|
],
|
||||||
static_libs: ["libbase"],
|
|
||||||
target: {
|
target: {
|
||||||
android: {
|
android: {
|
||||||
shared_libs: ["libdl"],
|
shared_libs: ["libdl"],
|
||||||
|
|
|
||||||
|
|
@ -57,11 +57,13 @@ cc_library {
|
||||||
name: "libziparchive",
|
name: "libziparchive",
|
||||||
host_supported: true,
|
host_supported: true,
|
||||||
defaults: ["libziparchive_defaults", "libziparchive_flags"],
|
defaults: ["libziparchive_defaults", "libziparchive_flags"],
|
||||||
static_libs: ["libutils"],
|
|
||||||
shared_libs: ["liblog", "libbase"],
|
shared_libs: ["liblog", "libbase"],
|
||||||
target: {
|
target: {
|
||||||
android: {
|
android: {
|
||||||
static_libs: ["libz"],
|
shared_libs: ["libz", "libutils"],
|
||||||
|
},
|
||||||
|
host: {
|
||||||
|
static_libs: ["libutils"],
|
||||||
},
|
},
|
||||||
linux_bionic: {
|
linux_bionic: {
|
||||||
static_libs: ["libz"],
|
static_libs: ["libz"],
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue