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/platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt b/platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt
index 9d5b064..14fa55a 100644
--- a/platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt
+++ b/platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt
@@ -121,7 +121,7 @@
 clip_strokerect,-1
 clipcubic,-1
 clipdrawdraw,0
-cliperror,0
+cliperror,3600
 clipped-bitmap-shaders-clamp,0
 clipped-bitmap-shaders-clamp-hq,0
 clipped-bitmap-shaders-mirror,0
@@ -410,7 +410,7 @@
 inverse_paths,-1
 jpg-color-cube,0
 largecircle,-1
-largeglyphblur,1
+largeglyphblur,3000
 lattice,-1
 lattice2,0
 lattice_alpha,0
@@ -422,8 +422,8 @@
 lightingcolorfilter,0
 lightingshader,0
 lightingshader2,-1
-linear_gradient,0
-linear_gradient_nodither,0
+linear_gradient,110000
+linear_gradient_nodither,120000
 linear_gradient_tiny,0
 lineclosepath,-1
 linepath,-1
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')