SkQP: slim deps. Also skia_enable_fontmgr_empty

Change-Id: I24ee2fb3a4a4ca03a60ee2f1a90e022825eee409
Reviewed-on: https://skia-review.googlesource.com/101820
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

4 files changed, 34 insertions, 8 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 5514093973..110cb0ede9 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -37,6 +37,7 @@ declare_args() {
   skia_enable_discrete_gpu = true
   skia_enable_effects = true
   skia_enable_flutter_defines = false
+  skia_enable_fontmgr_empty = false
   skia_enable_gpu = true
   skia_enable_pdf = true
   skia_enable_spirv_validation = is_skia_dev_build && is_debug
@@ -391,6 +392,13 @@ optional("fontmgr_custom") {
   ]
 }
 
+optional("fontmgr_empty") {
+  enabled = skia_enable_fontmgr_empty
+  sources = [
+    "src/ports/SkFontMgr_empty_factory.cpp",
+  ]
+}
+
 optional("fontmgr_fontconfig") {
   enabled = skia_use_freetype && skia_use_fontconfig
 
@@ -755,6 +763,7 @@ component("skia") {
     ":effects",
     ":fontmgr_android",
     ":fontmgr_custom",
+    ":fontmgr_empty",
     ":fontmgr_fontconfig",
     ":fontmgr_fuchsia",
     ":gpu",
@@ -1309,13 +1318,15 @@ if (skia_enable_tools) {
     }
     deps = [
       ":experimental_sksg",
-      ":experimental_svg_model",
       ":flags",
       ":skia",
       ":tool_utils",
       "//third_party/libpng",
       "//third_party/zlib",
     ]
+    if (skia_use_expat) {
+      deps += [ ":experimental_svg_model" ]
+    }
     public_deps = [
       ":gpu_tool_utils",  # Test.h #includes headers from this target.
     ]
diff --git a/platform_tools/android/bin/android_build_app b/platform_tools/android/bin/android_build_app
index 31afe96c2d..5f47ff20a0 100755
--- a/platform_tools/android/bin/android_build_app
+++ b/platform_tools/android/bin/android_build_app
@@ -28,7 +28,7 @@ if args.output_dir == None:
 args_gn_path = os.path.join(args.output_dir, "args.gn")
 if os.path.exists(args_gn_path):
   for line in open(args_gn_path):
-    m = re.match('target_cpu ?= ?"(.*)"', line.strip())
+    m = re.match('target_cpu *= *"(.*)"', line.strip())
     if m:
       target_cpu = m.group(1)
 
diff --git a/tests/SVGDeviceTest.cpp b/tests/SVGDeviceTest.cpp
index 715dbc7c15..7044559d83 100644
--- a/tests/SVGDeviceTest.cpp
+++ b/tests/SVGDeviceTest.cpp
@@ -5,6 +5,10 @@
  * found in the LICENSE file.
  */
 
+#include "SkTypes.h"
+
+#ifdef SK_XML
+
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkDOM.h"
@@ -144,3 +148,5 @@ DEF_TEST(SVGDevice_whitespace_pos, reporter) {
         test_whitespace_pos(reporter, tests[i].tst_in, tests[i].tst_out);
     }
 }
+
+#endif
diff --git a/tools/skqp/generate_gn_args b/tools/skqp/generate_gn_args
index cead4158ad..7031414d59 100755
--- a/tools/skqp/generate_gn_args
+++ b/tools/skqp/generate_gn_args
@@ -7,12 +7,21 @@
 import os
 import sys
 
-fmt = '''ndk = "{ndk}"
-ndk_api = 26
-target_cpu = "{arch}"
-skia_embed_resources = true
-is_debug = false
-skia_enable_pdf = false
+fmt = '''
+target_cpu                = "{arch}"
+is_debug                  = false
+ndk                       = "{ndk}"
+ndk_api                   = 26
+skia_embed_resources      = true
+skia_enable_fontmgr_empty = true
+skia_enable_pdf           = false
+skia_use_dng_sdk          = false
+skia_use_expat            = false
+skia_use_icu              = false
+skia_use_libheif          = false
+skia_use_lua              = false
+skia_use_piex             = false
+skia_use_skcms            = false
 '''
 
 def make_args_gn(out_dir, ndk, arch):