Replace -Weverything with -Wextra
am: 29cd4eca88

Change-Id: I22b6e736e3fc7393f90bbb32b259d556cb81b77f
diff --git a/Android.bp b/Android.bp
index ae3406e..9888fc7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,7 +15,6 @@
         "-D_FORTIFY_SOURCE=1",
         "-Wall",
         "-Werror",
-        "-Weverything",
         "-Wextra",
         "-Winit-self",
         "-Wno-bad-function-cast",
diff --git a/tools/skqp/gn_to_bp.py b/tools/skqp/gn_to_bp.py
index d6b8495..920c8f0 100755
--- a/tools/skqp/gn_to_bp.py
+++ b/tools/skqp/gn_to_bp.py
@@ -151,6 +151,9 @@
 defines.update(["SK_ENABLE_DUMP_GPU", "SK_BUILD_FOR_SKQP"])
 cflags_cc.update(['-Wno-extra-semi-stmt'])
 
+# Android does not want -Weverything set, it blocks toolchain updates.
+cflags.remove('-Weverything')
+
 gn_to_bp_utils.GrabDependentValues(js, '//:libskqp_app', 'sources', srcs, None)
 gn_to_bp_utils.GrabDependentValues(js, '//:libskqp_app', 'include_dirs',
                                    local_includes, 'freetype')