commit c995aba0d1fcdd54a92faa81befc18588653f8ff
author Chih-Hung Hsieh <chh@google.com> Thu Oct 12 23:16:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 12 23:16:01 2017 +0000
tree d6d2c433f3d02caa52f4875b9f0fe7202d1d263c
parent f281a17feaa34735f25fa880048d5c136fa73e9e
parent 0815c286809d38279dde847e24a903285a717deb

Use -Werror in frameworks/minikin
am: 0815c28680

Change-Id: I2cad2ae2533df6023e4194c59edaee4fdf82eea0

app/Android.bp

diff --git a/app/Android.bp b/app/Android.bp
index e8085c1..a74ca7e 100644
--- a/app/Android.bp
+++ b/app/Android.bp
@@ -27,4 +27,6 @@
     ],
 
     srcs: ["HyphTool.cpp"],
+
+    cflags: ["-Wall", "-Werror"],
 }

libs/minikin/Android.bp

diff --git a/libs/minikin/Android.bp b/libs/minikin/Android.bp
index c0fbbea..f0f4c81 100644
--- a/libs/minikin/Android.bp
+++ b/libs/minikin/Android.bp
@@ -25,6 +25,7 @@
     srcs: [
         "Hyphenator.cpp",
     ],
+    cflags: ["-Wall", "-Werror"],
     target: {
         android: {
             srcs: [

tests/stresstest/Android.bp

diff --git a/tests/stresstest/Android.bp b/tests/stresstest/Android.bp
index d91007a..e981ac7 100644
--- a/tests/stresstest/Android.bp
+++ b/tests/stresstest/Android.bp
@@ -42,7 +42,7 @@
         "MultithreadTest.cpp",
     ],
 
-    cppflags: [
+    cflags: [
         "-Werror",
         "-Wall",
         "-Wextra",

tests/unittest/Android.bp

diff --git a/tests/unittest/Android.bp b/tests/unittest/Android.bp
index 2353d4c..40e268d 100644
--- a/tests/unittest/Android.bp
+++ b/tests/unittest/Android.bp
@@ -57,7 +57,7 @@
         "WordBreakerTests.cpp",
     ],
 
-    cppflags: [
+    cflags: [
         "-Werror",
         "-Wall",
         "-Wextra",

tests/util/Android.bp

diff --git a/tests/util/Android.bp b/tests/util/Android.bp
index 50a2cd7..8d52983 100644
--- a/tests/util/Android.bp
+++ b/tests/util/Android.bp
@@ -6,6 +6,7 @@
         "MinikinFontForTest.cpp",
         "UnicodeUtils.cpp",
     ],
+    cflags: ["-Wall", "-Werror"],
     export_include_dirs: ["."],
     shared_libs: ["libxml2"],
     static_libs: ["libminikin"],