Merge "Implement wcwidth(3) in terms of icu4c."
diff --git a/libc/Android.bp b/libc/Android.bp
index 9101155..701a1b0 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1950,6 +1950,8 @@
 
     no_default_compiler_flags: true,
 
+    cflags: ["-Wno-gcc-compat", "-Werror"],
+
     arch: {
         arm: {
             local_include_dirs: ["arch-arm/include"],
@@ -1976,6 +1978,8 @@
 cc_defaults {
     name: "crt_so_defaults",
 
+    cflags: ["-Wno-gcc-compat", "-Werror"],
+
     vendor_available: true,
     arch: {
         mips: {