commit ba366f86f6451109d0f3e46a0f0afca20f701b27
author Chih-hung Hsieh <chh@google.com> Thu Oct 26 16:32:31 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 26 16:32:31 2017 +0000
tree 0e5a9b82ea970d1b24fd5e620dd588d2d71fb189
parent 2799b7380e5e2e32ba992cb6a8db8d9c970cc357
parent c60c2e02fe8265774bbfc7512e967336d0fe6bcb

Merge "Use -Werror in dalvik"

dexdump/Android.bp

diff --git a/dexdump/Android.bp b/dexdump/Android.bp
index 123e62f..3ea4471 100644
--- a/dexdump/Android.bp
+++ b/dexdump/Android.bp
@@ -23,6 +23,12 @@
     srcs: ["DexDump.cpp"],
     include_dirs: ["dalvik"],
 
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-unused-function",
+        "-Wno-unused-variable",
+    ],
     target: {
         android: {
             static_libs: [

libdex/Android.bp

diff --git a/libdex/Android.bp b/libdex/Android.bp
index b68e6af..95e3a5f 100644
--- a/libdex/Android.bp
+++ b/libdex/Android.bp
@@ -43,6 +43,13 @@
     static_libs: ["liblog"],
     whole_static_libs: ["libziparchive"],
 
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wno-conversion-null",
+        "-Wno-unused-function",
+        "-Wno-unused-variable",
+    ],
     target: {
         android: {
             shared_libs: ["libutils"],

tools/hprof-conv/Android.bp

diff --git a/tools/hprof-conv/Android.bp b/tools/hprof-conv/Android.bp
index 4956a74..4a7a317 100644
--- a/tools/hprof-conv/Android.bp
+++ b/tools/hprof-conv/Android.bp
@@ -15,6 +15,7 @@
 cc_binary_host {
     name: "hprof-conv",
     srcs: ["HprofConv.c"],
+    cflags: ["-Wall", "-Werror"],
     target: {
         windows: {
             enabled: true,