Merge "Use -Werror in system/extras" am: 560b2196d5
am: 954d9ce3e7
Change-Id: I37dbe88c991c3c3b475fba33a29c9bc66c511aed
diff --git a/Android.bp b/Android.bp
index b44c296..f441d6e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1 +1,16 @@
+cc_defaults {
+ name: "system-extras-cflags-defaults",
+ cflags: [
+ "-Wall",
+ "-Werror",
+ "-Wno-unused-parameter",
+ "-Wno-unused-result",
+ "-Wno-unused-variable",
+ ],
+ clang_cflags: [
+ "-Wno-incompatible-pointer-types-discards-qualifiers",
+ "-Wno-unused-const-variable",
+ ],
+}
+
subdirs = ["*"]
diff --git a/ext4_utils/Android.bp b/ext4_utils/Android.bp
index 7bc2f00..ff17edb 100644
--- a/ext4_utils/Android.bp
+++ b/ext4_utils/Android.bp
@@ -2,6 +2,7 @@
cc_library {
name: "libext4_utils",
+ defaults: ["system-extras-cflags-defaults"],
host_supported: true,
srcs: [
"make_ext4fs.c",
diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
index 2eeddb5..e550ac2 100644
--- a/ext4_utils/make_ext4fs.c
+++ b/ext4_utils/make_ext4fs.c
@@ -84,6 +84,7 @@
#endif
+#undef MAX_PATH
#define MAX_PATH 4096
#define MAX_BLK_MAPPING_STR 1000
diff --git a/f2fs_utils/Android.bp b/f2fs_utils/Android.bp
index 11bc778..9c20a1c 100644
--- a/f2fs_utils/Android.bp
+++ b/f2fs_utils/Android.bp
@@ -2,6 +2,7 @@
cc_library_host_static {
name: "libf2fs_utils_host",
+ defaults: ["system-extras-cflags-defaults"],
srcs: ["f2fs_utils.c"],
@@ -15,8 +16,6 @@
"external/f2fs-tools/mkfs",
],
- cflags: ["-Wno-unused-parameter"],
-
target: {
darwin: {
enabled: false,
@@ -26,6 +25,7 @@
cc_library_host_static {
name: "libf2fs_ioutils_host",
+ defaults: ["system-extras-cflags-defaults"],
srcs: ["f2fs_ioutils.c"],
@@ -34,8 +34,6 @@
"external/f2fs-tools/mkfs",
],
- cflags: ["-Wno-unused-parameter"],
-
static_libs: [
"libselinux",
"libsparse",
@@ -52,6 +50,7 @@
cc_library_host_static {
name: "libf2fs_dlutils_host",
+ defaults: ["system-extras-cflags-defaults"],
srcs: ["f2fs_dlutils.c"],
@@ -69,6 +68,7 @@
cc_library_shared {
name: "libf2fs_dlutils",
+ defaults: ["system-extras-cflags-defaults"],
srcs: ["f2fs_dlutils.c"],
@@ -86,6 +86,7 @@
cc_library_static {
name: "libf2fs_dlutils_static",
+ defaults: ["system-extras-cflags-defaults"],
srcs: ["f2fs_dlutils.c"],
@@ -103,6 +104,7 @@
cc_library_static {
name: "libf2fs_utils_static",
+ defaults: ["system-extras-cflags-defaults"],
srcs: ["f2fs_utils.c"],
@@ -111,8 +113,6 @@
"external/f2fs-tools/mkfs",
],
- cflags: ["-Wno-unused-parameter"],
-
static_libs: ["libsparse"],
target: {
@@ -124,6 +124,7 @@
cc_library_shared {
name: "libf2fs_sparseblock",
+ defaults: ["system-extras-cflags-defaults"],
srcs: ["f2fs_sparseblock.c"],
@@ -142,6 +143,7 @@
cc_binary {
name: "f2fs_sparseblock",
+ defaults: ["system-extras-cflags-defaults"],
srcs: ["f2fs_sparseblock.c"],
diff --git a/libpagemap/Android.bp b/libpagemap/Android.bp
index e06caa6..be7ed22 100644
--- a/libpagemap/Android.bp
+++ b/libpagemap/Android.bp
@@ -14,6 +14,7 @@
cc_library {
name: "libpagemap",
+ defaults: ["system-extras-cflags-defaults"],
vendor_available: true,
vndk: {
enabled: true,
@@ -25,18 +26,19 @@
"pm_memusage.c",
],
local_include_dirs: ["include"],
- cflags: ["-Wno-unused-parameter"],
export_include_dirs: ["include"],
}
cc_test {
name: "pagemap_test",
+ defaults: ["system-extras-cflags-defaults"],
srcs: ["pagemap_test.cpp"],
shared_libs: ["libpagemap"],
}
cc_test {
name: "pagemap_static_test",
+ defaults: ["system-extras-cflags-defaults"],
srcs: ["pagemap_test.cpp"],
static_libs: ["libpagemap"],
}
diff --git a/perfprofd/Android.bp b/perfprofd/Android.bp
index 2c07ca1..9a9b5d0 100644
--- a/perfprofd/Android.bp
+++ b/perfprofd/Android.bp
@@ -1,8 +1,11 @@
-perfprofd_cppflags = [
+perfprofd_cflags = [
"-Wall",
+ "-Werror",
+]
+
+perfprofd_cppflags = [
"-Wno-sign-compare",
"-Wno-unused-parameter",
- "-Werror",
]
//
@@ -28,6 +31,7 @@
"perfprofdcore.cc",
],
+ cflags: perfprofd_cflags,
cppflags: perfprofd_cppflags,
proto: {
@@ -41,7 +45,8 @@
cc_library_static {
name: "libperfprofdutils",
- cppflags: perfprofd_cppflags,
+ cflags: perfprofd_cflags,
+ cppflags: perfprofd_cppflags,
srcs: ["perfprofdutils.cc"],
}
@@ -65,6 +70,7 @@
system_shared_libs: [
"libc", "libdl",
],
+ cflags: perfprofd_cflags,
cppflags: perfprofd_cppflags,
init_rc: ["perfprofd.rc"],
diff --git a/perfprofd/tests/Android.bp b/perfprofd/tests/Android.bp
index 6bed5e3..f417947 100644
--- a/perfprofd/tests/Android.bp
+++ b/perfprofd/tests/Android.bp
@@ -1,10 +1,13 @@
// Build the unit tests.
-perfprofd_test_cppflags = [
+perfprofd_test_cflags = [
"-Wall",
+ "-Werror",
+]
+
+perfprofd_test_cppflags = [
"-Wno-sign-compare",
"-Wno-unused-parameter",
- "-Werror",
]
//
@@ -14,6 +17,7 @@
name: "libperfprofdmockutils",
include_dirs: ["system/extras/perfprofd"],
+ cflags: perfprofd_test_cflags,
cppflags: perfprofd_test_cppflags,
srcs: ["perfprofdmockutils.cc"],
}
@@ -37,6 +41,7 @@
"libcutils",
],
srcs: ["perfprofd_test.cc"],
+ cflags: perfprofd_test_cflags,
cppflags: perfprofd_test_cppflags,
data: [
"canned.perf.data",
diff --git a/squashfs_utils/Android.bp b/squashfs_utils/Android.bp
index c0d9b18..aa03d2f 100644
--- a/squashfs_utils/Android.bp
+++ b/squashfs_utils/Android.bp
@@ -2,6 +2,7 @@
cc_library_static {
name: "libsquashfs_utils",
+ defaults: ["system-extras-cflags-defaults"],
host_supported: true,
srcs: [
"squashfs_utils.c",