commit 1c37a8a943f3d84e0ed5d6cbefe09b5347fd2a50
author Justin Mattson <jmatt@google.com> Tue Apr 30 23:31:14 2019 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Tue Apr 30 23:31:14 2019 +0000
tree 2da453a6719e45b3913ec658b5a5469e9aa8d2d4
parent 61d5c5b1a348f1e35d5712fabbed00c37989fecc

[ermine] Put fonts in config-data package

The font service now expects them here instead of in the system
package.

SY-999 #comment

TEST=verify fonts look correct in ermine

Change-Id: I5be559f105fc191fb7d7681171cde23be0aaeed1

shell/ermine/BUILD.gn

diff --git a/shell/ermine/BUILD.gn b/shell/ermine/BUILD.gn
index 0b59121..bbdef58 100644
--- a/shell/ermine/BUILD.gn
+++ b/shell/ermine/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config.gni")
 import("//build/fidl/fidl.gni")
 import("//build/package.gni")
 import("//peridot/build/modular_config/modular_config.gni")
@@ -103,28 +104,22 @@
   config = "config/modular_config.json"
 }
 
-package("ermine_fonts") {
-  deprecated_system_image = true
+config_data("ermine_fonts") {
+  for_pkg = "fonts"
 
-  resources = [
-    {
-      path = rebase_path("fonts/manifest.json")
-      dest = "vendor/fonts/manifest.json"
-    },
-    {
-      path = rebase_path(
-              "//garnet/bin/fonts/third_party/robotomono/RobotoMono-Regular.ttf")
-      dest = "vendor/fonts/RobotoMono-Regular.ttf"
-    },
-    {
-      path = rebase_path(
-              "//garnet/bin/fonts/third_party/robotomono/RobotoMono-Medium.ttf")
-      dest = "vendor/fonts/RobotoMono-Medium.ttf"
-    },
-    {
-      path = rebase_path(
-              "//garnet/bin/fonts/third_party/robotomono/RobotoMono-Light.ttf")
-      dest = "vendor/fonts/RobotoMono-Light.ttf"
-    },
+  sources = [
+    "fonts/manifest.json",
+  ]
+
+  sources += rebase_path([
+                           "RobotoMono-Light.ttf",
+                           "RobotoMono-Medium.ttf",
+                           "RobotoMono-Regular.ttf",
+                         ],
+                         "",
+                         "//garnet/bin/fonts/third_party/robotomono/")
+
+  outputs = [
+    "fonts/{{source_file_part}}",
   ]
 }

shell/ermine/fonts/manifest.json

diff --git a/shell/ermine/fonts/manifest.json b/shell/ermine/fonts/manifest.json
index 4617539..0fb2b01 100644
--- a/shell/ermine/fonts/manifest.json
+++ b/shell/ermine/fonts/manifest.json
@@ -9,17 +9,17 @@
       "fallback": true,
       "fonts": [
         {
-          "asset": "/system/data/vendor/fonts/RobotoMono-Regular.ttf"
+          "asset": "RobotoMono-Regular.ttf"
         },
         {
-          "asset": "/system/data/vendor/fonts/RobotoMono-Light.ttf",
+          "asset": "RobotoMono-Light.ttf",
           "weight": 300
         },
         {
-          "asset": "/system/data/vendor/fonts/RobotoMono-Medium.ttf",
+          "asset": "RobotoMono-Medium.ttf",
           "weight": 500
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}