resources: optionally link them into our binary

To enable, set skia_embed_resources=true in args.gn.

Also add *-EmbededResouces bots.

Change-Id: Ia69b26e926a3ad4676a4fa021894432ea2104538
Reviewed-on: https://skia-review.googlesource.com/82626
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

5 files changed, 119 insertions, 0 deletions

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 44bc4ef94c..f2d79e0e6c 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -42,8 +42,10 @@
   "Build-Debian9-GCC-x86-Debug",
   "Build-Debian9-GCC-x86-Release",
   "Build-Debian9-GCC-x86_64-Debug",
+  "Build-Debian9-GCC-x86_64-Debug-EmbededResouces",
   "Build-Debian9-GCC-x86_64-Debug-NoGPU",
   "Build-Debian9-GCC-x86_64-Release",
+  "Build-Debian9-GCC-x86_64-Release-EmbededResouces",
   "Build-Debian9-GCC-x86_64-Release-Flutter_Android",
   "Build-Debian9-GCC-x86_64-Release-NoGPU",
   "Build-Debian9-GCC-x86_64-Release-PDFium",
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Debug-EmbededResouces.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Debug-EmbededResouces.json
new file mode 100644
index 0000000000..206b359afe
--- /dev/null
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-GCC-x86_64-Debug-EmbededResouces.json
@@ -0,0 +1,56 @@
+[
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn"
+    ],
+    "cwd": "[CUSTOM_/_B_WORK]/skia",
+    "env": {
+      "BUILDTYPE": "Debug",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces"
+    },
+    "infra_step": true,
+    "name": "fetch-gn"
+  },
+  {
+    "cmd": [
+      "[CUSTOM_/_B_WORK]/skia/bin/gn",
+      "gen",
+      "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces/Debug",
+      "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"] skia_embed_resoucres=true target_cpu=\"x86_64\""
+    ],
+    "cwd": "[CUSTOM_/_B_WORK]/skia",
+    "env": {
+      "BUILDTYPE": "Debug",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces"
+    },
+    "name": "gn gen"
+  },
+  {
+    "cmd": [
+      "ninja",
+      "-k",
+      "0",
+      "-C",
+      "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces/Debug"
+    ],
+    "cwd": "[CUSTOM_/_B_WORK]/skia",
+    "env": {
+      "BUILDTYPE": "Debug",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-GCC-x86_64-Debug-EmbededResouces"
+    },
+    "name": "ninja"
+  },
+  {
+    "name": "$result",
+    "recipe_result": null,
+    "status_code": 0
+  }
+]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/flavor/examples/full.py b/infra/bots/recipe_modules/flavor/examples/full.py
index 4ec7e8fef0..d1630daba1 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.py
+++ b/infra/bots/recipe_modules/flavor/examples/full.py
@@ -65,6 +65,7 @@ TEST_BUILDERS = [
   'Build-Debian9-Clang-x86_64-Release-Mini',
   'Build-Debian9-Clang-x86_64-Release-Vulkan',
   'Build-Debian9-EMCC-wasm-Release',
+  'Build-Debian9-GCC-x86_64-Debug-EmbededResouces',
   'Build-Debian9-GCC-x86_64-Release-ANGLE',
   'Build-Debian9-GCC-x86_64-Release-Flutter_Android',
   'Build-Debian9-GCC-x86_64-Release-NoGPU',
diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py
index 9e8e22baae..a5aad9e246 100644
--- a/infra/bots/recipe_modules/flavor/gn_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_flavor.py
@@ -141,6 +141,8 @@ with open(sys.argv[1], 'w') as f:
       })
     if extra_config == 'NoGPU':
       args['skia_enable_gpu'] = 'false'
+    if extra_config == 'EmbededResouces':
+      args['skia_embed_resoucres'] = 'true'
     if extra_config == 'Shared':
       args['is_component_build'] = 'true'
     if 'Vulkan' in extra_config and not 'Android' in extra_config:
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index af33679d4d..8f0a7c7bf8 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -258,6 +258,12 @@
         "Build-Debian9-GCC-x86_64-Debug"
       ]
     },
+    "Build-Debian9-GCC-x86_64-Debug-EmbededResouces": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Debian9-GCC-x86_64-Debug-EmbededResouces"
+      ]
+    },
     "Build-Debian9-GCC-x86_64-Debug-NoGPU": {
       "priority": 0.8,
       "tasks": [
@@ -270,6 +276,12 @@
         "Build-Debian9-GCC-x86_64-Release"
       ]
     },
+    "Build-Debian9-GCC-x86_64-Release-EmbededResouces": {
+      "priority": 0.8,
+      "tasks": [
+        "Build-Debian9-GCC-x86_64-Release-EmbededResouces"
+      ]
+    },
     "Build-Debian9-GCC-x86_64-Release-Flutter_Android": {
       "priority": 0.8,
       "tasks": [
@@ -4232,6 +4244,29 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
+    "Build-Debian9-GCC-x86_64-Debug-EmbededResouces": {
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "os:Debian-9.2",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "compile",
+        "repository=<(REPO)",
+        "buildername=Build-Debian9-GCC-x86_64-Debug-EmbededResouces",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
     "Build-Debian9-GCC-x86_64-Debug-NoGPU": {
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -4278,6 +4313,29 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
+    "Build-Debian9-GCC-x86_64-Release-EmbededResouces": {
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "os:Debian-9.2",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "compile",
+        "repository=<(REPO)",
+        "buildername=Build-Debian9-GCC-x86_64-Release-EmbededResouces",
+        "swarm_out_dir=${ISOLATED_OUTDIR}",
+        "revision=<(REVISION)",
+        "patch_repo=<(PATCH_REPO)",
+        "patch_storage=<(PATCH_STORAGE)",
+        "patch_issue=<(ISSUE)",
+        "patch_set=<(PATCHSET)"
+      ],
+      "isolate": "compile_skia.isolate",
+      "priority": 0.8
+    },
     "Build-Debian9-GCC-x86_64-Release-Flutter_Android": {
       "dependencies": [
         "Housekeeper-PerCommit-IsolateAndroidNDKLinux"