Use -Werror in external/libese
am: c5b766a726
Change-Id: Ib15f084f809f69bcff20574e43ce4f71f2f34a2d
diff --git a/apps/boot/Android.bp b/apps/boot/Android.bp
index bca1d60..3838966 100644
--- a/apps/boot/Android.bp
+++ b/apps/boot/Android.bp
@@ -18,6 +18,7 @@
name: "libese-app-boot",
defaults: ["libese-app-defaults"],
srcs: ["boot.c"],
+ cflags: ["-Wall", "-Werror"],
host_supported: true,
shared_libs: ["liblog", "libese", "libese-sysdeps"],
}
@@ -27,7 +28,11 @@
defaults: ["libese-app-defaults"],
srcs: ["boot.c"],
host_supported: true,
- cflags: ["-fvisibility=default"],
+ cflags: [
+ "-fvisibility=default",
+ "-Wall",
+ "-Werror",
+ ],
shared_libs: ["liblog", "libese", "libese-sysdeps"],
}
@@ -46,6 +51,7 @@
"libese-hw-nxp-pn80t-nq-nci",
],
host_supported: false,
+ cflags: ["-Wall", "-Werror"],
target: {
darwin: {
enabled: false,
diff --git a/apps/boot/tests/Android.bp b/apps/boot/tests/Android.bp
index f25a9ba..48a1f2b 100644
--- a/apps/boot/tests/Android.bp
+++ b/apps/boot/tests/Android.bp
@@ -19,7 +19,11 @@
proprietary: true,
srcs: ["ese_app_boot_tests.cpp", "ese_operations_wrapper.cpp"],
host_supported: true,
- cflags: ["-Wno-unused-parameter"],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ "-Wno-unused-parameter",
+ ],
shared_libs: [
"libese-app-boot-fortest",
"libese",
diff --git a/apps/weaver/Android.bp b/apps/weaver/Android.bp
index 7c4312b..d4948a9 100644
--- a/apps/weaver/Android.bp
+++ b/apps/weaver/Android.bp
@@ -18,6 +18,11 @@
name: "libese-app-weaver",
defaults: ["libese-app-defaults"],
srcs: ["weaver.c"],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ "-Wno-error=unused-variable",
+ ],
shared_libs: ["liblog", "libese", "libese-sysdeps"],
}
@@ -25,6 +30,7 @@
name: "libese-app-weaver-test",
defaults: ["libese-app-defaults"],
srcs: ["tests/weaver_test.cpp"],
+ cflags: ["-Wall", "-Werror"],
shared_libs: [
"libese",
"libese-app-weaver",
diff --git a/examples/Android.bp b/examples/Android.bp
index 693982c..7c36ad1 100644
--- a/examples/Android.bp
+++ b/examples/Android.bp
@@ -19,6 +19,7 @@
proprietary: true,
srcs: ["ese_nxp_sample.c"],
host_supported: false,
+ cflags: ["-Wall", "-Werror"],
target: {
darwin: {
enabled: false,
diff --git a/libese-hw/Android.bp b/libese-hw/Android.bp
index de49009..7e0d555 100644
--- a/libese-hw/Android.bp
+++ b/libese-hw/Android.bp
@@ -20,7 +20,11 @@
defaults: ["libese-defaults"],
srcs: ["ese_hw_fake.c"],
host_supported: true,
- cflags: ["-DLOG_NDEBUG=0"],
+ cflags: [
+ "-DLOG_NDEBUG=0",
+ "-Wall",
+ "-Werror",
+ ],
shared_libs: ["liblog", "libese"],
}
@@ -30,7 +34,11 @@
defaults: ["libese-defaults"],
host_supported: true,
srcs: ["ese_hw_echo.c"],
- cflags: ["-DLOG_NDEBUG=0"],
+ cflags: [
+ "-DLOG_NDEBUG=0",
+ "-Wall",
+ "-Werror",
+ ],
shared_libs: ["liblog", "libese", "libese-teq1"],
}
diff --git a/libese-hw/nxp/Android.bp b/libese-hw/nxp/Android.bp
index 1950052..506a32a 100644
--- a/libese-hw/nxp/Android.bp
+++ b/libese-hw/nxp/Android.bp
@@ -27,6 +27,11 @@
],
local_include_dirs: ["include"],
export_include_dirs: ["include"],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ "-Wno-error=unused-variable",
+ ],
target: {
darwin: {
enabled: false,
@@ -62,4 +67,9 @@
name: "libese-hw-nxp-pn80t-nq-nci",
defaults: ["pn80t_platform"],
srcs: ["pn80t/nq_nci.c"],
+ cflags: [
+ "-Wall",
+ "-Werror",
+ "-Wno-error=unused-variable",
+ ],
}
diff --git a/libese-hw/tests/Android.bp b/libese-hw/tests/Android.bp
index cf7a436..ef1f783 100644
--- a/libese-hw/tests/Android.bp
+++ b/libese-hw/tests/Android.bp
@@ -18,6 +18,7 @@
name: "ese_hw_tests",
proprietary: true,
srcs: ["ese_hw_echo_tests.cpp"],
+ cflags: ["-Wall", "-Werror"],
host_supported: true,
shared_libs: [
"libese",
diff --git a/libese-sysdeps/Android.bp b/libese-sysdeps/Android.bp
index 4f0078a..ea537a8 100644
--- a/libese-sysdeps/Android.bp
+++ b/libese-sysdeps/Android.bp
@@ -22,7 +22,11 @@
local_include_dirs: [
"include",
],
- cflags: ["-std=c99"],
+ cflags: [
+ "-std=c99",
+ "-Wall",
+ "-Werror",
+ ],
debug: {
cflags: ["-DLOG_NDEBUG=0"],
},
diff --git a/libese-teq1/Android.bp b/libese-teq1/Android.bp
index d897e49..888ddc5 100644
--- a/libese-teq1/Android.bp
+++ b/libese-teq1/Android.bp
@@ -19,6 +19,7 @@
defaults: ["libese-api-defaults"],
host_supported: true,
srcs: ["teq1.c"],
+ cflags: ["-Wall", "-Werror"],
shared_libs: ["liblog", "libese", "libese-sysdeps"],
}
@@ -29,6 +30,7 @@
host_supported: true,
srcs: ["teq1.c"],
+ cflags: ["-Wall", "-Werror"],
// Ensure that only explicitly exported symbols are visible.
shared_libs: ["liblog", "libese", "libese-sysdeps"],
diff --git a/libese-teq1/tests/Android.bp b/libese-teq1/tests/Android.bp
index a6f1621..ada25ce 100644
--- a/libese-teq1/tests/Android.bp
+++ b/libese-teq1/tests/Android.bp
@@ -18,6 +18,7 @@
name: "ese_teq1_unittests",
proprietary: true,
srcs: ["teq1_unittests.cpp", "ese_operations_wrapper.cpp" ],
+ cflags: ["-Wall", "-Werror"],
host_supported: true,
shared_libs: [
"libese",
diff --git a/libese/Android.bp b/libese/Android.bp
index 8352170..6993604 100644
--- a/libese/Android.bp
+++ b/libese/Android.bp
@@ -18,7 +18,12 @@
name: "libese-defaults",
proprietary: true,
- cflags: ["-std=c99", "-D_FORTIFY_SOURCE=2"],
+ cflags: [
+ "-std=c99",
+ "-D_FORTIFY_SOURCE=2",
+ "-Wall",
+ "-Werror",
+ ],
// This doesn't work yet, but is good documentation for when
// debugging is needed.
diff --git a/libese/tests/Android.bp b/libese/tests/Android.bp
index a39062d..9e10f03 100644
--- a/libese/tests/Android.bp
+++ b/libese/tests/Android.bp
@@ -23,6 +23,7 @@
"sg_unittests.cpp",
],
host_supported: true,
+ cflags: ["-Wall", "-Werror"],
shared_libs: [
"libese",
"libese-hw-fake",
diff --git a/third_party/NXPNFC_P61_JCOP_Kit/Android.bp b/third_party/NXPNFC_P61_JCOP_Kit/Android.bp
index 9d6e8d0..52dd09f 100644
--- a/third_party/NXPNFC_P61_JCOP_Kit/Android.bp
+++ b/third_party/NXPNFC_P61_JCOP_Kit/Android.bp
@@ -13,7 +13,8 @@
],
cflags: [
"-DNXP_LDR_SVC_VER_2=TRUE",
- "-W", "-Wall",
+ "-Wall",
+ "-Werror",
"-Wno-format",
"-Wno-parentheses-equality",
"-Wno-tautological-constant-out-of-range-compare",
diff --git a/tools/ese_ls_provision/Android.bp b/tools/ese_ls_provision/Android.bp
index e3527bb..c5dd636 100644
--- a/tools/ese_ls_provision/Android.bp
+++ b/tools/ese_ls_provision/Android.bp
@@ -23,7 +23,11 @@
enabled: false,
},
},
- cflags: ["-DNXP_LDR_SVC_VER_2=TRUE"],
+ cflags: [
+ "-DNXP_LDR_SVC_VER_2=TRUE",
+ "-Wall",
+ "-Werror",
+ ],
shared_libs: [
"libbase", "libese", "libese-hw-nxp-pn80t-nq-nci", "libese-teq1", "libp61-jcop-kit"],
srcs: ["ese_ls_provision.cpp"],
diff --git a/tools/ese_relay/Android.bp b/tools/ese_relay/Android.bp
index 2a40108..6a64c56 100644
--- a/tools/ese_relay/Android.bp
+++ b/tools/ese_relay/Android.bp
@@ -23,7 +23,13 @@
enabled: false,
},
},
- cflags: ["-std=c99", "-D_FORTIFY_SOURCE=2"],
+ cflags: [
+ "-std=c99",
+ "-D_FORTIFY_SOURCE=2",
+ "-Wall",
+ "-Werror",
+ "-Wno-error=unused-variable",
+ ],
srcs: ["ese_relay.c"],
shared_libs: [
"liblog",
diff --git a/tools/ese_replay/Android.bp b/tools/ese_replay/Android.bp
index 7ebb97f..2721b3e 100644
--- a/tools/ese_replay/Android.bp
+++ b/tools/ese_replay/Android.bp
@@ -20,6 +20,7 @@
srcs: ["main.c", "hw.c", "buffer.c", "payload.c"],
shared_libs: ["liblog", "libese"],
host_supported: true,
+ cflags: ["-Wall", "-Werror"],
target: {
darwin: {
enabled: false,
