tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove libziparchive dependency on libutils"

Browse source
This commit is contained in:
David Sehr 2018-01-19 00:03:47 +00:00 committed by Gerrit Code Review
commit 34f8eaab0d
1 changed files with 71 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
libutils/Android.bp
View file

@ -43,8 +43,8 @@ cc_library_headers {
},
}
cc_library {
name: "libutils",
cc_defaults {
name: "libutils_defaults",
vendor_available: true,
vndk: {
enabled: true,
@ -52,29 +52,6 @@ cc_library {
},
host_supported: true,
srcs: [
"CallStack.cpp",
"FileMap.cpp",
"JenkinsHash.cpp",
"NativeHandle.cpp",
"Printer.cpp",
"PropertyMap.cpp",
"RefBase.cpp",
"SharedBuffer.cpp",
"Static.cpp",
"StopWatch.cpp",
"String8.cpp",
"String16.cpp",
"StrongPointer.cpp",
"SystemClock.cpp",
"Threads.cpp",
"Timers.cpp",
"Tokenizer.cpp",
"Unicode.cpp",
"VectorImpl.cpp",
"misc.cpp",
],
cflags: ["-Wall", "-Werror"],
include_dirs: ["external/safe-iop/include"],
header_libs: [
@ -96,14 +73,9 @@ cc_library {
target: {
android: {
srcs: [
"Trace.cpp",
],
cflags: ["-fvisibility=protected"],
shared_libs: [
"libbacktrace",
"libcutils",
"libdl",
"libvndksupport",
@ -113,12 +85,6 @@ cc_library {
misc_undefined: ["integer"],
},
},
linux: {
srcs: [
"Looper.cpp",
"ProcessCallStack.cpp",
],
},
host: {
cflags: ["-DLIBUTILS_NATIVE=1"],
@ -148,6 +114,75 @@ cc_library {
},
}
cc_library {
name: "libutils",
defaults: ["libutils_defaults"],
srcs: [
"FileMap.cpp",
"JenkinsHash.cpp",
"NativeHandle.cpp",
"Printer.cpp",
"PropertyMap.cpp",
"RefBase.cpp",
"SharedBuffer.cpp",
"Static.cpp",
"StopWatch.cpp",
"String8.cpp",
"String16.cpp",
"StrongPointer.cpp",
"SystemClock.cpp",
"Threads.cpp",
"Timers.cpp",
"Tokenizer.cpp",
"Unicode.cpp",
"VectorImpl.cpp",
"misc.cpp",
],
target: {
android: {
srcs: [
"Trace.cpp",
],
},
linux: {
srcs: [
"Looper.cpp",
],
},
},
}
cc_library {
name: "libutilscallstack",
defaults: ["libutils_defaults"],
srcs: [
"CallStack.cpp",
],
arch: {
mips: {
cflags: ["-DALIGN_DOUBLE"],
},
},
target: {
android: {
shared_libs: [
"libutils",
"libbacktrace",
],
},
linux: {
srcs: [
"ProcessCallStack.cpp",
],
},
},
}
// Include subdirectory makefiles
// ============================================================