summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2018-02-19 20:02:59 -0600
committerGerrit Code Review2018-02-19 20:02:59 -0600
commit0609e8d231822c6be9ab33eba3d6514525ce3ae6 (patch)
treecbdae5e4eeed5ec4e665448cf338ab63af27f681 /debuggerd
parentcb1b68f9b3f7c4b33fda5bb88445b0c573e86a35 (diff)
parentdc699a269f6a22af6cbba0f6e1359fde103dc4d3 (diff)
downloadplatform-system-core-0609e8d231822c6be9ab33eba3d6514525ce3ae6.tar.gz
platform-system-core-0609e8d231822c6be9ab33eba3d6514525ce3ae6.tar.xz
platform-system-core-0609e8d231822c6be9ab33eba3d6514525ce3ae6.zip
Merge "bpfmt."
Diffstat (limited to 'debuggerd')
-rw-r--r--debuggerd/Android.bp15
1 files changed, 9 insertions, 6 deletions
diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp
index 532352410..7e6f24d15 100644
--- a/debuggerd/Android.bp
+++ b/debuggerd/Android.bp
@@ -16,7 +16,7 @@ cc_defaults {
16 16
17cc_library_headers { 17cc_library_headers {
18 name: "libdebuggerd_common_headers", 18 name: "libdebuggerd_common_headers",
19 export_include_dirs: ["common/include"] 19 export_include_dirs: ["common/include"],
20} 20}
21 21
22cc_library_shared { 22cc_library_shared {
@@ -39,7 +39,7 @@ cc_library_shared {
39 ], 39 ],
40 40
41 export_header_lib_headers: ["libdebuggerd_common_headers"], 41 export_header_lib_headers: ["libdebuggerd_common_headers"],
42 export_include_dirs: ["tombstoned/include"] 42 export_include_dirs: ["tombstoned/include"],
43} 43}
44 44
45// Utility library to tombstoned and get an output fd. 45// Utility library to tombstoned and get an output fd.
@@ -60,7 +60,7 @@ cc_library_static {
60 ], 60 ],
61 61
62 export_header_lib_headers: ["libdebuggerd_common_headers"], 62 export_header_lib_headers: ["libdebuggerd_common_headers"],
63 export_include_dirs: ["tombstoned/include"] 63 export_include_dirs: ["tombstoned/include"],
64} 64}
65 65
66// Core implementation, linked into libdebuggerd_handler and the dynamic linker. 66// Core implementation, linked into libdebuggerd_handler and the dynamic linker.
@@ -186,7 +186,10 @@ cc_test {
186 "client/debuggerd_client_test.cpp", 186 "client/debuggerd_client_test.cpp",
187 "debuggerd_test.cpp", 187 "debuggerd_test.cpp",
188 ], 188 ],
189 static_libs: ["libasync_safe", "libtombstoned_client_static"], 189 static_libs: [
190 "libasync_safe",
191 "libtombstoned_client_static",
192 ],
190 }, 193 },
191 }, 194 },
192 195
@@ -197,7 +200,7 @@ cc_test {
197 "libdebuggerd_client", 200 "libdebuggerd_client",
198 "liblog", 201 "liblog",
199 "libminijail", 202 "libminijail",
200 "libnativehelper" 203 "libnativehelper",
201 ], 204 ],
202 205
203 static_libs: [ 206 static_libs: [
@@ -298,7 +301,7 @@ cc_binary {
298 "liblog", 301 "liblog",
299 ], 302 ],
300 303
301 init_rc: ["tombstoned/tombstoned.rc"] 304 init_rc: ["tombstoned/tombstoned.rc"],
302} 305}
303 306
304subdirs = [ 307subdirs = [