diff options
author | David Sehr | 2018-01-18 18:03:47 -0600 |
---|---|---|
committer | Gerrit Code Review | 2018-01-18 18:03:47 -0600 |
commit | 34f8eaab0de825b9a83b90348d837245c19ca728 (patch) | |
tree | 1dc884481593dea6d65c22be47284918da419704 | |
parent | 5e5056c5a575f6c117985f2003c71eae1900337c (diff) | |
parent | abfb9f3b991a0b681bb988624c8319e80abf63a6 (diff) | |
download | platform-system-core-34f8eaab0de825b9a83b90348d837245c19ca728.tar.gz platform-system-core-34f8eaab0de825b9a83b90348d837245c19ca728.tar.xz platform-system-core-34f8eaab0de825b9a83b90348d837245c19ca728.zip |
Merge "Remove libziparchive dependency on libutils"
-rw-r--r-- | libutils/Android.bp | 107 |
1 files changed, 71 insertions, 36 deletions
diff --git a/libutils/Android.bp b/libutils/Android.bp index 6b50f0cff..3bca6c82f 100644 --- a/libutils/Android.bp +++ b/libutils/Android.bp | |||
@@ -43,8 +43,8 @@ cc_library_headers { | |||
43 | }, | 43 | }, |
44 | } | 44 | } |
45 | 45 | ||
46 | cc_library { | 46 | cc_defaults { |
47 | name: "libutils", | 47 | name: "libutils_defaults", |
48 | vendor_available: true, | 48 | vendor_available: true, |
49 | vndk: { | 49 | vndk: { |
50 | enabled: true, | 50 | enabled: true, |
@@ -52,29 +52,6 @@ cc_library { | |||
52 | }, | 52 | }, |
53 | host_supported: true, | 53 | host_supported: true, |
54 | 54 | ||
55 | srcs: [ | ||
56 | "CallStack.cpp", | ||
57 | "FileMap.cpp", | ||
58 | "JenkinsHash.cpp", | ||
59 | "NativeHandle.cpp", | ||
60 | "Printer.cpp", | ||
61 | "PropertyMap.cpp", | ||
62 | "RefBase.cpp", | ||
63 | "SharedBuffer.cpp", | ||
64 | "Static.cpp", | ||
65 | "StopWatch.cpp", | ||
66 | "String8.cpp", | ||
67 | "String16.cpp", | ||
68 | "StrongPointer.cpp", | ||
69 | "SystemClock.cpp", | ||
70 | "Threads.cpp", | ||
71 | "Timers.cpp", | ||
72 | "Tokenizer.cpp", | ||
73 | "Unicode.cpp", | ||
74 | "VectorImpl.cpp", | ||
75 | "misc.cpp", | ||
76 | ], | ||
77 | |||
78 | cflags: ["-Wall", "-Werror"], | 55 | cflags: ["-Wall", "-Werror"], |
79 | include_dirs: ["external/safe-iop/include"], | 56 | include_dirs: ["external/safe-iop/include"], |
80 | header_libs: [ | 57 | header_libs: [ |
@@ -96,14 +73,9 @@ cc_library { | |||
96 | 73 | ||
97 | target: { | 74 | target: { |
98 | android: { | 75 | android: { |
99 | srcs: [ | ||
100 | "Trace.cpp", | ||
101 | ], | ||
102 | |||
103 | cflags: ["-fvisibility=protected"], | 76 | cflags: ["-fvisibility=protected"], |
104 | 77 | ||
105 | shared_libs: [ | 78 | shared_libs: [ |
106 | "libbacktrace", | ||
107 | "libcutils", | 79 | "libcutils", |
108 | "libdl", | 80 | "libdl", |
109 | "libvndksupport", | 81 | "libvndksupport", |
@@ -113,12 +85,6 @@ cc_library { | |||
113 | misc_undefined: ["integer"], | 85 | misc_undefined: ["integer"], |
114 | }, | 86 | }, |
115 | }, | 87 | }, |
116 | linux: { | ||
117 | srcs: [ | ||
118 | "Looper.cpp", | ||
119 | "ProcessCallStack.cpp", | ||
120 | ], | ||
121 | }, | ||
122 | 88 | ||
123 | host: { | 89 | host: { |
124 | cflags: ["-DLIBUTILS_NATIVE=1"], | 90 | cflags: ["-DLIBUTILS_NATIVE=1"], |
@@ -148,6 +114,75 @@ cc_library { | |||
148 | }, | 114 | }, |
149 | } | 115 | } |
150 | 116 | ||
117 | cc_library { | ||
118 | name: "libutils", | ||
119 | defaults: ["libutils_defaults"], | ||
120 | |||
121 | srcs: [ | ||
122 | "FileMap.cpp", | ||
123 | "JenkinsHash.cpp", | ||
124 | "NativeHandle.cpp", | ||
125 | "Printer.cpp", | ||
126 | "PropertyMap.cpp", | ||
127 | "RefBase.cpp", | ||
128 | "SharedBuffer.cpp", | ||
129 | "Static.cpp", | ||
130 | "StopWatch.cpp", | ||
131 | "String8.cpp", | ||
132 | "String16.cpp", | ||
133 | "StrongPointer.cpp", | ||
134 | "SystemClock.cpp", | ||
135 | "Threads.cpp", | ||
136 | "Timers.cpp", | ||
137 | "Tokenizer.cpp", | ||
138 | "Unicode.cpp", | ||
139 | "VectorImpl.cpp", | ||
140 | "misc.cpp", | ||
141 | ], | ||
142 | |||
143 | target: { | ||
144 | android: { | ||
145 | srcs: [ | ||
146 | "Trace.cpp", | ||
147 | ], | ||
148 | }, | ||
149 | linux: { | ||
150 | srcs: [ | ||
151 | "Looper.cpp", | ||
152 | ], | ||
153 | }, | ||
154 | }, | ||
155 | } | ||
156 | |||
157 | cc_library { | ||
158 | name: "libutilscallstack", | ||
159 | defaults: ["libutils_defaults"], | ||
160 | |||
161 | srcs: [ | ||
162 | "CallStack.cpp", | ||
163 | ], | ||
164 | |||
165 | arch: { | ||
166 | mips: { | ||
167 | cflags: ["-DALIGN_DOUBLE"], | ||
168 | }, | ||
169 | }, | ||
170 | |||
171 | target: { | ||
172 | android: { | ||
173 | shared_libs: [ | ||
174 | "libutils", | ||
175 | "libbacktrace", | ||
176 | ], | ||
177 | }, | ||
178 | linux: { | ||
179 | srcs: [ | ||
180 | "ProcessCallStack.cpp", | ||
181 | ], | ||
182 | }, | ||
183 | }, | ||
184 | } | ||
185 | |||
151 | // Include subdirectory makefiles | 186 | // Include subdirectory makefiles |
152 | // ============================================================ | 187 | // ============================================================ |
153 | 188 | ||