diff --git a/BUILD.gn b/BUILD.gn
index 843f9b9ae4..349ac1fb74 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -2015,7 +2015,13 @@ if (skia_enable_tools) {
   }
 
   if (!is_win) {
-    test_lib("skqp_lib") {
+    source_set("skqp_lib") {
+      check_includes = false
+      testonly = true
+      if (!is_official_build) {
+        configs -= [ "//gn:warnings" ]
+      }
+      public_configs = [ ":skia_private" ]
       defines =
           [ "SK_SKQP_GLOBAL_ERROR_TOLERANCE=$skia_skqp_global_error_tolerance" ]
       sources = [
@@ -2053,8 +2059,12 @@ if (skia_enable_tools) {
     }
   }
   if (is_android) {
-    test_app("skqp_app") {
-      is_shared_library = true
+    shared_library("libskqp_app") {
+      configs += [ ":skia_private" ]
+      if (!is_official_build) {
+        configs -= [ "//gn:warnings" ]
+      }
+      testonly = true
       sources = [
         "tools/skqp/src/jni_skqp.cpp",
       ]
diff --git a/tools/skqp/gn_to_bp.py b/tools/skqp/gn_to_bp.py
index 8fd614a070..99b022c567 100755
--- a/tools/skqp/gn_to_bp.py
+++ b/tools/skqp/gn_to_bp.py
@@ -149,6 +149,9 @@ defines      = {str(d) for d in js['targets']['//:libskqp_app']['defines']}
 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.
+assert '-Weverything' not in cflags
+
 gn_to_bp_utils.GrabDependentValues(js, '//:libskqp_app', 'sources', srcs, None)
 gn_to_bp_utils.GrabDependentValues(js, '//:libskqp_app', 'include_dirs',
                                    local_includes, 'freetype')