Use -Werror in system/core
* Move -Wall -Werror from cppflags to cflags.
* Fix/suppress warning on unused variables.
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I1e05e96a1d0bcb2ccef1ce456504b3af57167cc5
diff --git a/Android.bp b/Android.bp
index f4a8411..7ff02a0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,11 +14,10 @@
// limitations under the License.
//
-libbase_cppflags = [
- "-Wall",
- "-Wextra",
- "-Werror",
-]
+cc_defaults {
+ name: "libbase_defaults",
+ cflags: ["-Wall", "-Werror", "-Wextra"],
+}
cc_library_headers {
name: "libbase_headers",
@@ -38,6 +37,7 @@
cc_library {
name: "libbase",
+ defaults: ["libbase_defaults"],
vendor_available: true,
host_supported: true,
vndk: {
@@ -59,7 +59,6 @@
],
export_header_lib_headers: ["libbase_headers"],
- cppflags: libbase_cppflags,
shared_libs: ["liblog"],
target: {
android: {
@@ -102,6 +101,7 @@
// ------------------------------------------------------------------------------
cc_test {
name: "libbase_test",
+ defaults: ["libbase_defaults"],
host_supported: true,
srcs: [
"endian_test.cpp",
@@ -133,7 +133,6 @@
},
},
local_include_dirs: ["."],
- cppflags: libbase_cppflags,
shared_libs: ["libbase"],
compile_multilib: "both",
multilib: {