Snap for 9372998 from a611500f6e3daa01452890410da82bc8ba512df8 to udc-d1-release

Change-Id: Ic73b8ec276976e447a8b8665e38729004af3b292

7 files changed, 16 insertions, 27 deletions

diff --git a/Android.bp b/Android.bp
index f5aaf31..8988459 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,6 +2,16 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+cc_defaults {
+    name: "libminikin_defaults",
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wextra",
+        "-Wthread-safety",
+    ],
+}
+
 cc_library_headers {
     name: "libminikin_headers",
     host_supported: true,
diff --git a/app/Android.bp b/app/Android.bp
index 9d6c28a..939d58c 100644
--- a/app/Android.bp
+++ b/app/Android.bp
@@ -33,5 +33,5 @@ cc_binary_host {
 
     srcs: ["HyphTool.cpp"],
 
-    cflags: ["-Wall", "-Werror"],
+    defaults: ["libminikin_defaults"],
 }
diff --git a/libs/minikin/Android.bp b/libs/minikin/Android.bp
index 33f5134..57a0188 100644
--- a/libs/minikin/Android.bp
+++ b/libs/minikin/Android.bp
@@ -57,10 +57,7 @@ cc_library {
         "SystemFonts.cpp",
         "WordBreaker.cpp",
     ],
-    cflags: [
-        "-Wall",
-        "-Werror",
-    ],
+    defaults: ["libminikin_defaults"],
     sanitize: {
         misc_undefined: [
             "signed-integer-overflow",
@@ -68,12 +65,6 @@ cc_library {
             "bounds",
         ],
     },
-    cppflags: [
-        "-Werror",
-        "-Wall",
-        "-Wextra",
-        "-Wthread-safety",
-    ],
     product_variables: {
         debuggable: {
             // Enable assertion on eng and userdebug build.
diff --git a/tests/perftests/Android.bp b/tests/perftests/Android.bp
index 19ed8eb..4eb47c9 100644
--- a/tests/perftests/Android.bp
+++ b/tests/perftests/Android.bp
@@ -21,11 +21,7 @@ package {
 cc_benchmark {
     name: "minikin_perftests",
     test_suites: ["device-tests"],
-    cppflags: [
-        "-Werror",
-        "-Wall",
-        "-Wextra",
-    ],
+    defaults: ["libminikin_defaults"],
     srcs: [
         "FontCollection.cpp",
         "FontLanguage.cpp",
diff --git a/tests/stresstest/Android.bp b/tests/stresstest/Android.bp
index 784dc6a..cebefe5 100644
--- a/tests/stresstest/Android.bp
+++ b/tests/stresstest/Android.bp
@@ -47,9 +47,5 @@ cc_test {
         "MultithreadTest.cpp",
     ],
 
-    cflags: [
-        "-Werror",
-        "-Wall",
-        "-Wextra",
-    ],
+    defaults: ["libminikin_defaults"],
 }
diff --git a/tests/unittest/Android.bp b/tests/unittest/Android.bp
index d36c52f..d73fa30 100644
--- a/tests/unittest/Android.bp
+++ b/tests/unittest/Android.bp
@@ -79,9 +79,5 @@ cc_test {
         "WordBreakerTests.cpp",
     ],
 
-    cflags: [
-        "-Werror",
-        "-Wall",
-        "-Wextra",
-    ],
+    defaults: ["libminikin_defaults"],
 }
diff --git a/tests/util/Android.bp b/tests/util/Android.bp
index 1d3d8cf..d8c153d 100644
--- a/tests/util/Android.bp
+++ b/tests/util/Android.bp
@@ -11,7 +11,7 @@ cc_library_static {
         "PathUtils.cpp",
         "UnicodeUtils.cpp",
     ],
-    cflags: ["-Wall", "-Werror"],
+    defaults: ["libminikin_defaults"],
     export_include_dirs: ["."],
     shared_libs: ["libxml2", "libft2"],
     static_libs: ["libminikin"],