Remove libziparchive dependency on libutils
Prevent future cyclic dependency from libunwind changes.
Bug: 66919073
Test: make -j 50
Change-Id: I2a4fa5b7c2c3a82db2073d0fa51940da6603be1f
diff --git a/libutils/Android.bp b/libutils/Android.bp
index 6b50f0c..3bca6c8 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -43,8 +43,8 @@
},
}
-cc_library {
- name: "libutils",
+cc_defaults {
+ name: "libutils_defaults",
vendor_available: true,
vndk: {
enabled: true,
@@ -52,29 +52,6 @@
},
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 @@
target: {
android: {
- srcs: [
- "Trace.cpp",
- ],
-
cflags: ["-fvisibility=protected"],
shared_libs: [
- "libbacktrace",
"libcutils",
"libdl",
"libvndksupport",
@@ -113,12 +85,6 @@
misc_undefined: ["integer"],
},
},
- linux: {
- srcs: [
- "Looper.cpp",
- "ProcessCallStack.cpp",
- ],
- },
host: {
cflags: ["-DLIBUTILS_NATIVE=1"],
@@ -148,6 +114,75 @@
},
}
+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
// ============================================================