Revert of content_shell: Remove deps for resources only needed at run…

…time. (patchset chromium#1 id:1 of https://codereview.chromium.org/2469073004/ ) Reason for revert: Broke Mac builds of content shell. See Robert Sesek's comments. Original issue's description: > content_shell: Remove deps for resources only needed at runtime. > > https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/reference.md#data_deps_Non_linked-dependencies > > data_deps are non-linked runtime dependencies. They are built and available > > at runtime. > > The .pak and font resources are not linked but rather just needed at > runtime. > > Split out of https://codereview.chromium.org/2460503002/ > > BUG=524758 > > Committed: https://crrev.com/3d9a6345c105cd59cb62f6c5aa9649ac4560b0b0 > Cr-Commit-Position: refs/heads/master@{#429517} [email protected],[email protected],[email protected],[email protected] # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=524758 Review-Url: https://codereview.chromium.org/2522323002 Cr-Commit-Position: refs/heads/master@{#434571}
feiyue1206 · Nov 26, 2016 · fa69073 · fa69073
1 parent 9f43b01
commit fa69073
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/components/test_runner/BUILD.gn b/components/test_runner/BUILD.gn
@@ -107,6 +107,7 @@ component("test_runner") {
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   deps = [
+    ":resources",
     "//base:base",
     "//base:i18n",
     "//cc",
@@ -190,18 +191,23 @@ if (is_mac) {
 }
 
 group("resources") {
+  deps = []
   data_deps = []
 
   if (is_mac) {
+    deps += [ ":test_runner_bundle_data" ]
     data_deps += [ ":test_runner_bundle_data" ]
   } else {
+    deps += [ ":copy_ahem" ]
     data_deps += [ ":copy_ahem" ]
   }
 
   if (use_x11) {
+    deps += [ ":copy_x11_fonts" ]
     data_deps += [ ":copy_x11_fonts" ]
   }
   if (is_android) {
+    deps += [ ":copy_android_fonts" ]
     data_deps += [ ":copy_android_fonts" ]
   }
 }
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
@@ -407,6 +407,9 @@ group("resources") {
   public_deps = [
     ":copy_shell_resources",
   ]
+  deps = [
+    "//components/test_runner:resources",
+  ]
   data_deps = [
     "//components/test_runner:resources",
   ]
@@ -510,6 +513,7 @@ if (is_android) {
 
     deps = [
       ":content_shell_lib",
+      ":pak",
       "//build/config/sanitizers:deps",
       "//build/win:default_exe_manifest",
     ]

diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
@@ -230,6 +230,7 @@ static_library("test_support") {
     "//content/public/renderer",
     "//content/public/utility",
     "//content/renderer:for_content_tests",
+    "//content/shell:pak",
     "//content/utility:for_content_tests",
     "//device/base/synchronization",
     "//device/geolocation",
@@ -683,6 +684,7 @@ test("content_browsertests") {
     "//content/public/renderer",
     "//content/renderer:for_content_tests",
     "//content/shell:content_shell_lib",
+    "//content/shell:pak",
     "//content/test:test_support",
     "//device/base/synchronization",
     "//device/battery",