summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--adb/Android.bp60
-rw-r--r--base/Android.bp6
-rw-r--r--debuggerd/Android.bp15
-rw-r--r--demangle/Android.bp4
-rw-r--r--init/Android.bp2
-rw-r--r--init/test_service/Android.bp5
-rw-r--r--libappfuse/Android.bp4
-rw-r--r--libasyncio/Android.bp6
-rw-r--r--libbacktrace/Android.bp13
-rw-r--r--libion/Android.bp1
-rw-r--r--libmemunreachable/Android.bp2
-rw-r--r--libnativebridge/Android.bp10
-rw-r--r--libnativeloader/test/Android.bp11
-rw-r--r--libpackagelistparser/Android.bp5
-rw-r--r--libprocinfo/Android.bp11
-rw-r--r--libsystem/Android.bp2
-rw-r--r--libunwindstack/Android.bp10
-rw-r--r--libutils/Android.bp14
-rw-r--r--libutils/tests/Android.bp10
-rw-r--r--libvndksupport/Android.bp5
-rw-r--r--libvndksupport/tests/Android.bp7
-rw-r--r--logcat/Android.bp7
-rw-r--r--logd/Android.bp2
-rw-r--r--logwrapper/Android.bp2
-rw-r--r--trusty/keymaster/Android.bp5
-rw-r--r--trusty/libtrusty/Android.bp5
-rw-r--r--trusty/libtrusty/tipc-test/Android.bp5
-rw-r--r--trusty/storage/lib/Android.bp2
-rw-r--r--trusty/storage/proxy/Android.bp2
-rw-r--r--usbd/Android.bp1
30 files changed, 148 insertions, 86 deletions
diff --git a/adb/Android.bp b/adb/Android.bp
index 41f7b8952..0858a6c12 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -13,39 +13,39 @@
13// limitations under the License. 13// limitations under the License.
14 14
15python_binary_host { 15python_binary_host {
16 name: "adb_integration_test_adb", 16 name: "adb_integration_test_adb",
17 main: "test_adb.py", 17 main: "test_adb.py",
18 srcs: [ 18 srcs: [
19 "test_adb.py", 19 "test_adb.py",
20 ], 20 ],
21 libs: [ 21 libs: [
22 "adb_py", 22 "adb_py",
23 ], 23 ],
24 version: { 24 version: {
25 py2: { 25 py2: {
26 enabled: true, 26 enabled: true,
27 },
28 py3: {
29 enabled: false,
30 },
27 }, 31 },
28 py3: {
29 enabled: false,
30 },
31 },
32} 32}
33 33
34python_binary_host { 34python_binary_host {
35 name: "adb_integration_test_device", 35 name: "adb_integration_test_device",
36 main: "test_device.py", 36 main: "test_device.py",
37 srcs: [ 37 srcs: [
38 "test_device.py", 38 "test_device.py",
39 ], 39 ],
40 libs: [ 40 libs: [
41 "adb_py", 41 "adb_py",
42 ], 42 ],
43 version: { 43 version: {
44 py2: { 44 py2: {
45 enabled: true, 45 enabled: true,
46 }, 46 },
47 py3: { 47 py3: {
48 enabled: false, 48 enabled: false,
49 },
49 }, 50 },
50 },
51} 51}
diff --git a/base/Android.bp b/base/Android.bp
index 6cadcfc0f..acbc6b7c0 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -16,7 +16,11 @@
16 16
17cc_defaults { 17cc_defaults {
18 name: "libbase_defaults", 18 name: "libbase_defaults",
19 cflags: ["-Wall", "-Werror", "-Wextra"], 19 cflags: [
20 "-Wall",
21 "-Werror",
22 "-Wextra",
23 ],
20} 24}
21 25
22cc_library_headers { 26cc_library_headers {
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 = [
diff --git a/demangle/Android.bp b/demangle/Android.bp
index 89b87725f..8d5b1350c 100644
--- a/demangle/Android.bp
+++ b/demangle/Android.bp
@@ -42,11 +42,11 @@ cc_library {
42 ], 42 ],
43 43
44 local_include_dirs: [ 44 local_include_dirs: [
45 "include", 45 "include",
46 ], 46 ],
47 47
48 export_include_dirs: [ 48 export_include_dirs: [
49 "include", 49 "include",
50 ], 50 ],
51} 51}
52 52
diff --git a/init/Android.bp b/init/Android.bp
index 1f2ad2e78..69b4ee4a7 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -56,7 +56,7 @@ cc_defaults {
56 }, 56 },
57 uml: { 57 uml: {
58 cppflags: ["-DUSER_MODE_LINUX"], 58 cppflags: ["-DUSER_MODE_LINUX"],
59 } 59 },
60 }, 60 },
61 static_libs: [ 61 static_libs: [
62 "libbootloader_message", 62 "libbootloader_message",
diff --git a/init/test_service/Android.bp b/init/test_service/Android.bp
index 63996993a..8bd16a74f 100644
--- a/init/test_service/Android.bp
+++ b/init/test_service/Android.bp
@@ -17,7 +17,10 @@
17cc_binary { 17cc_binary {
18 name: "test_service", 18 name: "test_service",
19 srcs: ["test_service.cpp"], 19 srcs: ["test_service.cpp"],
20 cflags: ["-Wall", "-Werror"], 20 cflags: [
21 "-Wall",
22 "-Werror",
23 ],
21 shared_libs: ["libbase"], 24 shared_libs: ["libbase"],
22 init_rc: ["test_service.rc"], 25 init_rc: ["test_service.rc"],
23} 26}
diff --git a/libappfuse/Android.bp b/libappfuse/Android.bp
index 29ffe3244..ae1481f72 100644
--- a/libappfuse/Android.bp
+++ b/libappfuse/Android.bp
@@ -19,7 +19,7 @@ cc_library_shared {
19 "FuseBuffer.cc", 19 "FuseBuffer.cc",
20 "FuseBridgeLoop.cc", 20 "FuseBridgeLoop.cc",
21 "EpollController.cc", 21 "EpollController.cc",
22 ] 22 ],
23} 23}
24 24
25cc_test { 25cc_test {
@@ -31,5 +31,5 @@ cc_test {
31 "tests/FuseAppLoopTest.cc", 31 "tests/FuseAppLoopTest.cc",
32 "tests/FuseBridgeLoopTest.cc", 32 "tests/FuseBridgeLoopTest.cc",
33 "tests/FuseBufferTest.cc", 33 "tests/FuseBufferTest.cc",
34 ] 34 ],
35} 35}
diff --git a/libasyncio/Android.bp b/libasyncio/Android.bp
index 9a12f0d2d..8a2afea3d 100644
--- a/libasyncio/Android.bp
+++ b/libasyncio/Android.bp
@@ -16,7 +16,11 @@
16 16
17cc_defaults { 17cc_defaults {
18 name: "libasyncio_defaults", 18 name: "libasyncio_defaults",
19 cflags: ["-Wall", "-Werror", "-Wextra"], 19 cflags: [
20 "-Wall",
21 "-Werror",
22 "-Wextra",
23 ],
20} 24}
21 25
22cc_library { 26cc_library {
diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
index be5653131..4bd01d2cc 100644
--- a/libbacktrace/Android.bp
+++ b/libbacktrace/Android.bp
@@ -27,7 +27,6 @@ cc_defaults {
27 27
28 include_dirs: ["external/libunwind/include/tdep"], 28 include_dirs: ["external/libunwind/include/tdep"],
29 29
30
31 target: { 30 target: {
32 darwin: { 31 darwin: {
33 enabled: false, 32 enabled: false,
@@ -41,7 +40,7 @@ cc_defaults {
41 lib64: { 40 lib64: {
42 suffix: "64", 41 suffix: "64",
43 }, 42 },
44 } 43 },
45} 44}
46 45
47libbacktrace_sources = [ 46libbacktrace_sources = [
@@ -84,8 +83,8 @@ cc_library {
84 darwin: { 83 darwin: {
85 enabled: true, 84 enabled: true,
86 shared_libs: [ 85 shared_libs: [
87 "libbase", 86 "libbase",
88 ], 87 ],
89 }, 88 },
90 linux: { 89 linux: {
91 srcs: libbacktrace_sources, 90 srcs: libbacktrace_sources,
@@ -106,7 +105,7 @@ cc_library {
106 "art/runtime", 105 "art/runtime",
107 ], 106 ],
108 107
109 header_libs: [ "jni_headers", ], 108 header_libs: ["jni_headers"],
110 }, 109 },
111 android: { 110 android: {
112 static_libs: ["libasync_safe"], 111 static_libs: ["libasync_safe"],
@@ -114,7 +113,7 @@ cc_library {
114 vendor: { 113 vendor: {
115 cflags: ["-DNO_LIBDEXFILE_SUPPORT"], 114 cflags: ["-DNO_LIBDEXFILE_SUPPORT"],
116 exclude_shared_libs: ["libdexfile"], 115 exclude_shared_libs: ["libdexfile"],
117 } 116 },
118 }, 117 },
119 whole_static_libs: ["libdemangle"], 118 whole_static_libs: ["libdemangle"],
120} 119}
@@ -130,7 +129,7 @@ cc_library_shared {
130 srcs: ["backtrace_testlib.cpp"], 129 srcs: ["backtrace_testlib.cpp"],
131 130
132 shared_libs: [ 131 shared_libs: [
133 "libunwindstack", 132 "libunwindstack",
134 ], 133 ],
135} 134}
136 135
diff --git a/libion/Android.bp b/libion/Android.bp
index 6d9fae076..2f73d92ca 100644
--- a/libion/Android.bp
+++ b/libion/Android.bp
@@ -1,4 +1,3 @@
1
2cc_library { 1cc_library {
3 name: "libion", 2 name: "libion",
4 vendor_available: true, 3 vendor_available: true,
diff --git a/libmemunreachable/Android.bp b/libmemunreachable/Android.bp
index 8b76a6513..b428dd785 100644
--- a/libmemunreachable/Android.bp
+++ b/libmemunreachable/Android.bp
@@ -16,7 +16,7 @@ cc_defaults {
16 }, 16 },
17 host: { 17 host: {
18 shared_libs: ["liblog"], 18 shared_libs: ["liblog"],
19 } 19 },
20 }, 20 },
21} 21}
22 22
diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp
index 089f3b825..6e63b74c6 100644
--- a/libnativebridge/Android.bp
+++ b/libnativebridge/Android.bp
@@ -1,9 +1,8 @@
1
2cc_library_headers { 1cc_library_headers {
3 name: "libnativebridge-dummy-headers", 2 name: "libnativebridge-dummy-headers",
4 3
5 host_supported: true, 4 host_supported: true,
6 export_include_dirs=["include"], 5 export_include_dirs: ["include"],
7} 6}
8 7
9cc_library { 8cc_library {
@@ -11,9 +10,12 @@ cc_library {
11 10
12 host_supported: true, 11 host_supported: true,
13 srcs: ["native_bridge.cc"], 12 srcs: ["native_bridge.cc"],
14 shared_libs: ["liblog", "libbase"], 13 shared_libs: [
14 "liblog",
15 "libbase",
16 ],
15 17
16 export_include_dirs=["include"], 18 export_include_dirs: ["include"],
17 19
18 cflags: [ 20 cflags: [
19 "-Werror", 21 "-Werror",
diff --git a/libnativeloader/test/Android.bp b/libnativeloader/test/Android.bp
index 2d3370435..5cf88b09b 100644
--- a/libnativeloader/test/Android.bp
+++ b/libnativeloader/test/Android.bp
@@ -17,31 +17,34 @@
17cc_library { 17cc_library {
18 name: "libfoo.oem1", 18 name: "libfoo.oem1",
19 srcs: ["test.cpp"], 19 srcs: ["test.cpp"],
20 cflags : ["-DLIBNAME=\"libfoo.oem1.so\""], 20 cflags: ["-DLIBNAME=\"libfoo.oem1.so\""],
21 shared_libs: [ 21 shared_libs: [
22 "libbase", 22 "libbase",
23 ], 23 ],
24} 24}
25
25cc_library { 26cc_library {
26 name: "libbar.oem1", 27 name: "libbar.oem1",
27 srcs: ["test.cpp"], 28 srcs: ["test.cpp"],
28 cflags : ["-DLIBNAME=\"libbar.oem1.so\""], 29 cflags: ["-DLIBNAME=\"libbar.oem1.so\""],
29 shared_libs: [ 30 shared_libs: [
30 "libbase", 31 "libbase",
31 ], 32 ],
32} 33}
34
33cc_library { 35cc_library {
34 name: "libfoo.oem2", 36 name: "libfoo.oem2",
35 srcs: ["test.cpp"], 37 srcs: ["test.cpp"],
36 cflags : ["-DLIBNAME=\"libfoo.oem2.so\""], 38 cflags: ["-DLIBNAME=\"libfoo.oem2.so\""],
37 shared_libs: [ 39 shared_libs: [
38 "libbase", 40 "libbase",
39 ], 41 ],
40} 42}
43
41cc_library { 44cc_library {
42 name: "libbar.oem2", 45 name: "libbar.oem2",
43 srcs: ["test.cpp"], 46 srcs: ["test.cpp"],
44 cflags : ["-DLIBNAME=\"libbar.oem2.so\""], 47 cflags: ["-DLIBNAME=\"libbar.oem2.so\""],
45 shared_libs: [ 48 shared_libs: [
46 "libbase", 49 "libbase",
47 ], 50 ],
diff --git a/libpackagelistparser/Android.bp b/libpackagelistparser/Android.bp
index 3d202fc1d..27693b3f8 100644
--- a/libpackagelistparser/Android.bp
+++ b/libpackagelistparser/Android.bp
@@ -2,7 +2,10 @@ cc_library {
2 2
3 name: "libpackagelistparser", 3 name: "libpackagelistparser",
4 srcs: ["packagelistparser.c"], 4 srcs: ["packagelistparser.c"],
5 cflags: ["-Wall", "-Werror"], 5 cflags: [
6 "-Wall",
7 "-Werror",
8 ],
6 shared_libs: ["liblog"], 9 shared_libs: ["liblog"],
7 local_include_dirs: ["include"], 10 local_include_dirs: ["include"],
8 export_include_dirs: ["include"], 11 export_include_dirs: ["include"],
diff --git a/libprocinfo/Android.bp b/libprocinfo/Android.bp
index 1cfabd5be..83b0a7fcf 100644
--- a/libprocinfo/Android.bp
+++ b/libprocinfo/Android.bp
@@ -16,7 +16,11 @@
16 16
17cc_defaults { 17cc_defaults {
18 name: "libprocinfo_defaults", 18 name: "libprocinfo_defaults",
19 cflags: ["-Wall", "-Werror", "-Wextra"], 19 cflags: [
20 "-Wall",
21 "-Werror",
22 "-Wextra",
23 ],
20} 24}
21 25
22cc_library { 26cc_library {
@@ -65,7 +69,10 @@ cc_test {
65 }, 69 },
66 }, 70 },
67 71
68 shared_libs: ["libbase", "libprocinfo"], 72 shared_libs: [
73 "libbase",
74 "libprocinfo",
75 ],
69 76
70 compile_multilib: "both", 77 compile_multilib: "both",
71 multilib: { 78 multilib: {
diff --git a/libsystem/Android.bp b/libsystem/Android.bp
index 846a58526..82bf1bce0 100644
--- a/libsystem/Android.bp
+++ b/libsystem/Android.bp
@@ -11,5 +11,5 @@ cc_library_headers {
11 windows: { 11 windows: {
12 enabled: true, 12 enabled: true,
13 }, 13 },
14 } 14 },
15} 15}
diff --git a/libunwindstack/Android.bp b/libunwindstack/Android.bp
index a7bdd2e6d..124c70e83 100644
--- a/libunwindstack/Android.bp
+++ b/libunwindstack/Android.bp
@@ -78,7 +78,10 @@ cc_library {
78 target: { 78 target: {
79 // Always disable optimizations for host to make it easier to debug. 79 // Always disable optimizations for host to make it easier to debug.
80 host: { 80 host: {
81 cflags: ["-O0", "-g"], 81 cflags: [
82 "-O0",
83 "-g",
84 ],
82 }, 85 },
83 vendor: { 86 vendor: {
84 cflags: ["-DNO_LIBDEXFILE_SUPPORT"], 87 cflags: ["-DNO_LIBDEXFILE_SUPPORT"],
@@ -131,7 +134,10 @@ cc_library_static {
131 target: { 134 target: {
132 // Always disable optimizations for host to make it easier to debug. 135 // Always disable optimizations for host to make it easier to debug.
133 host: { 136 host: {
134 cflags: ["-O0", "-g"], 137 cflags: [
138 "-O0",
139 "-g",
140 ],
135 }, 141 },
136 }, 142 },
137 143
diff --git a/libutils/Android.bp b/libutils/Android.bp
index 2be5d9896..209bf9a93 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -20,12 +20,12 @@ cc_library_headers {
20 header_libs: [ 20 header_libs: [
21 "liblog_headers", 21 "liblog_headers",
22 "libsystem_headers", 22 "libsystem_headers",
23 "libcutils_headers" 23 "libcutils_headers",
24 ], 24 ],
25 export_header_lib_headers: [ 25 export_header_lib_headers: [
26 "liblog_headers", 26 "liblog_headers",
27 "libsystem_headers", 27 "libsystem_headers",
28 "libcutils_headers" 28 "libcutils_headers",
29 ], 29 ],
30 export_include_dirs: ["include"], 30 export_include_dirs: ["include"],
31 31
@@ -52,7 +52,10 @@ cc_defaults {
52 }, 52 },
53 host_supported: true, 53 host_supported: true,
54 54
55 cflags: ["-Wall", "-Werror"], 55 cflags: [
56 "-Wall",
57 "-Werror",
58 ],
56 include_dirs: ["external/safe-iop/include"], 59 include_dirs: ["external/safe-iop/include"],
57 header_libs: [ 60 header_libs: [
58 "libutils_headers", 61 "libutils_headers",
@@ -193,7 +196,10 @@ cc_test {
193 static_libs: ["libutils"], 196 static_libs: ["libutils"],
194 shared_libs: ["liblog"], 197 shared_libs: ["liblog"],
195 srcs: ["SharedBufferTest.cpp"], 198 srcs: ["SharedBufferTest.cpp"],
196 cflags: ["-Wall", "-Werror"], 199 cflags: [
200 "-Wall",
201 "-Werror",
202 ],
197} 203}
198 204
199subdirs = ["tests"] 205subdirs = ["tests"]
diff --git a/libutils/tests/Android.bp b/libutils/tests/Android.bp
index a3e7ffe73..1390552fa 100644
--- a/libutils/tests/Android.bp
+++ b/libutils/tests/Android.bp
@@ -77,7 +77,10 @@ cc_test_library {
77 host_supported: true, 77 host_supported: true,
78 relative_install_path: "libutils_tests", 78 relative_install_path: "libutils_tests",
79 srcs: ["Singleton_test1.cpp"], 79 srcs: ["Singleton_test1.cpp"],
80 cflags: ["-Wall", "-Werror"], 80 cflags: [
81 "-Wall",
82 "-Werror",
83 ],
81} 84}
82 85
83cc_test_library { 86cc_test_library {
@@ -85,6 +88,9 @@ cc_test_library {
85 host_supported: true, 88 host_supported: true,
86 relative_install_path: "libutils_tests", 89 relative_install_path: "libutils_tests",
87 srcs: ["Singleton_test2.cpp"], 90 srcs: ["Singleton_test2.cpp"],
88 cflags: ["-Wall", "-Werror"], 91 cflags: [
92 "-Wall",
93 "-Werror",
94 ],
89 shared_libs: ["libutils_tests_singleton1"], 95 shared_libs: ["libutils_tests_singleton1"],
90} 96}
diff --git a/libvndksupport/Android.bp b/libvndksupport/Android.bp
index fec79b70d..e73b36652 100644
--- a/libvndksupport/Android.bp
+++ b/libvndksupport/Android.bp
@@ -3,7 +3,10 @@ subdirs = ["tests"]
3cc_library { 3cc_library {
4 name: "libvndksupport", 4 name: "libvndksupport",
5 srcs: ["linker.c"], 5 srcs: ["linker.c"],
6 cflags: ["-Wall", "-Werror"], 6 cflags: [
7 "-Wall",
8 "-Werror",
9 ],
7 local_include_dirs: ["include/vndksupport"], 10 local_include_dirs: ["include/vndksupport"],
8 export_include_dirs: ["include"], 11 export_include_dirs: ["include"],
9 shared_libs: ["liblog"], 12 shared_libs: ["liblog"],
diff --git a/libvndksupport/tests/Android.bp b/libvndksupport/tests/Android.bp
index 5b467f8ff..2570cce95 100644
--- a/libvndksupport/tests/Android.bp
+++ b/libvndksupport/tests/Android.bp
@@ -17,11 +17,14 @@ cc_test {
17 srcs: [ 17 srcs: [
18 "linker_test.cpp", 18 "linker_test.cpp",
19 ], 19 ],
20 cflags: ["-Wall", "-Werror"], 20 cflags: [
21 "-Wall",
22 "-Werror",
23 ],
21 24
22 host_supported: false, 25 host_supported: false,
23 shared_libs: [ 26 shared_libs: [
24 "libvndksupport", 27 "libvndksupport",
25 "libbase", 28 "libbase",
26 ] 29 ],
27} 30}
diff --git a/logcat/Android.bp b/logcat/Android.bp
index afc7a0182..01beb53e8 100644
--- a/logcat/Android.bp
+++ b/logcat/Android.bp
@@ -68,8 +68,11 @@ cc_prebuilt_binary {
68 srcs: ["logpersist"], 68 srcs: ["logpersist"],
69 init_rc: ["logcatd.rc"], 69 init_rc: ["logcatd.rc"],
70 required: ["logcatd"], 70 required: ["logcatd"],
71 symlinks: ["logpersist.stop", "logpersist.cat"], 71 symlinks: [
72 "logpersist.stop",
73 "logpersist.cat",
74 ],
72 strip: { 75 strip: {
73 none: true, 76 none: true,
74 } 77 },
75} 78}
diff --git a/logd/Android.bp b/logd/Android.bp
index 68b79d32e..5c79976a3 100644
--- a/logd/Android.bp
+++ b/logd/Android.bp
@@ -25,7 +25,7 @@ event_flag = [
25 "-DAUDITD_LOG_TAG=1003", 25 "-DAUDITD_LOG_TAG=1003",
26 "-DCHATTY_LOG_TAG=1004", 26 "-DCHATTY_LOG_TAG=1004",
27 "-DTAG_DEF_LOG_TAG=1005", 27 "-DTAG_DEF_LOG_TAG=1005",
28 "-DLIBLOG_LOG_TAG=1006" 28 "-DLIBLOG_LOG_TAG=1006",
29] 29]
30 30
31cc_library_static { 31cc_library_static {
diff --git a/logwrapper/Android.bp b/logwrapper/Android.bp
index ccb1aa609..f163f576b 100644
--- a/logwrapper/Android.bp
+++ b/logwrapper/Android.bp
@@ -49,5 +49,5 @@ cc_benchmark {
49 ], 49 ],
50 cflags: [ 50 cflags: [
51 "-Werror", 51 "-Werror",
52 ] 52 ],
53} 53}
diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp
index 322a63d28..5428e733e 100644
--- a/trusty/keymaster/Android.bp
+++ b/trusty/keymaster/Android.bp
@@ -31,7 +31,10 @@ cc_binary {
31 "trusty_keymaster_ipc.cpp", 31 "trusty_keymaster_ipc.cpp",
32 "trusty_keymaster_main.cpp", 32 "trusty_keymaster_main.cpp",
33 ], 33 ],
34 cflags: ["-Wall", "-Werror"], 34 cflags: [
35 "-Wall",
36 "-Werror",
37 ],
35 shared_libs: [ 38 shared_libs: [
36 "libcrypto", 39 "libcrypto",
37 "libcutils", 40 "libcutils",
diff --git a/trusty/libtrusty/Android.bp b/trusty/libtrusty/Android.bp
index c48deed1c..f6e9bee3d 100644
--- a/trusty/libtrusty/Android.bp
+++ b/trusty/libtrusty/Android.bp
@@ -22,7 +22,10 @@ cc_library {
22 22
23 srcs: ["trusty.c"], 23 srcs: ["trusty.c"],
24 export_include_dirs: ["include"], 24 export_include_dirs: ["include"],
25 cflags: ["-Wall", "-Werror"], 25 cflags: [
26 "-Wall",
27 "-Werror",
28 ],
26 29
27 shared_libs: ["liblog"], 30 shared_libs: ["liblog"],
28} 31}
diff --git a/trusty/libtrusty/tipc-test/Android.bp b/trusty/libtrusty/tipc-test/Android.bp
index 1e8467f0f..32499e3f1 100644
--- a/trusty/libtrusty/tipc-test/Android.bp
+++ b/trusty/libtrusty/tipc-test/Android.bp
@@ -25,5 +25,8 @@ cc_test {
25 "liblog", 25 "liblog",
26 ], 26 ],
27 gtest: false, 27 gtest: false,
28 cflags: ["-Wall", "-Werror"], 28 cflags: [
29 "-Wall",
30 "-Werror",
31 ],
29} 32}
diff --git a/trusty/storage/lib/Android.bp b/trusty/storage/lib/Android.bp
index 4e41674bd..2fba17edd 100644
--- a/trusty/storage/lib/Android.bp
+++ b/trusty/storage/lib/Android.bp
@@ -34,5 +34,5 @@ cc_library_static {
34 "-fvisibility=hidden", 34 "-fvisibility=hidden",
35 "-Wall", 35 "-Wall",
36 "-Werror", 36 "-Werror",
37 ] 37 ],
38} 38}
diff --git a/trusty/storage/proxy/Android.bp b/trusty/storage/proxy/Android.bp
index da8542d5a..b93facbbc 100644
--- a/trusty/storage/proxy/Android.bp
+++ b/trusty/storage/proxy/Android.bp
@@ -36,5 +36,5 @@ cc_binary {
36 cflags: [ 36 cflags: [
37 "-Wall", 37 "-Wall",
38 "-Werror", 38 "-Werror",
39 ] 39 ],
40} 40}
diff --git a/usbd/Android.bp b/usbd/Android.bp
index 4f9338fef..3afa7a951 100644
--- a/usbd/Android.bp
+++ b/usbd/Android.bp
@@ -13,4 +13,3 @@ cc_binary {
13 "libcutils", 13 "libcutils",
14 ], 14 ],
15} 15}
16