diff options
Diffstat (limited to 'base')
-rw-r--r-- | base/Android.bp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/base/Android.bp b/base/Android.bp index f4a841107..7ff02a0ee 100644 --- a/base/Android.bp +++ b/base/Android.bp | |||
@@ -14,11 +14,10 @@ | |||
14 | // limitations under the License. | 14 | // limitations under the License. |
15 | // | 15 | // |
16 | 16 | ||
17 | libbase_cppflags = [ | 17 | cc_defaults { |
18 | "-Wall", | 18 | name: "libbase_defaults", |
19 | "-Wextra", | 19 | cflags: ["-Wall", "-Werror", "-Wextra"], |
20 | "-Werror", | 20 | } |
21 | ] | ||
22 | 21 | ||
23 | cc_library_headers { | 22 | cc_library_headers { |
24 | name: "libbase_headers", | 23 | name: "libbase_headers", |
@@ -38,6 +37,7 @@ cc_library_headers { | |||
38 | 37 | ||
39 | cc_library { | 38 | cc_library { |
40 | name: "libbase", | 39 | name: "libbase", |
40 | defaults: ["libbase_defaults"], | ||
41 | vendor_available: true, | 41 | vendor_available: true, |
42 | host_supported: true, | 42 | host_supported: true, |
43 | vndk: { | 43 | vndk: { |
@@ -59,7 +59,6 @@ cc_library { | |||
59 | ], | 59 | ], |
60 | export_header_lib_headers: ["libbase_headers"], | 60 | export_header_lib_headers: ["libbase_headers"], |
61 | 61 | ||
62 | cppflags: libbase_cppflags, | ||
63 | shared_libs: ["liblog"], | 62 | shared_libs: ["liblog"], |
64 | target: { | 63 | target: { |
65 | android: { | 64 | android: { |
@@ -102,6 +101,7 @@ cc_library { | |||
102 | // ------------------------------------------------------------------------------ | 101 | // ------------------------------------------------------------------------------ |
103 | cc_test { | 102 | cc_test { |
104 | name: "libbase_test", | 103 | name: "libbase_test", |
104 | defaults: ["libbase_defaults"], | ||
105 | host_supported: true, | 105 | host_supported: true, |
106 | srcs: [ | 106 | srcs: [ |
107 | "endian_test.cpp", | 107 | "endian_test.cpp", |
@@ -133,7 +133,6 @@ cc_test { | |||
133 | }, | 133 | }, |
134 | }, | 134 | }, |
135 | local_include_dirs: ["."], | 135 | local_include_dirs: ["."], |
136 | cppflags: libbase_cppflags, | ||
137 | shared_libs: ["libbase"], | 136 | shared_libs: ["libbase"], |
138 | compile_multilib: "both", | 137 | compile_multilib: "both", |
139 | multilib: { | 138 | multilib: { |