From 4eebe74dc1fd6d3780180361f75707a6be33c3ce Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Wed, 13 Aug 2014 02:54:46 +0000 Subject: Refactor webkit resources targets. * First, this was to remove blink_common_resources target that was moved * into third_party/WebKit/public:resources. * Second, the above clean up reduced webkit/BUILD.gn into a single * target that could be moved closer to webkit_resources.grd, becoming * webkit/glue/resources/BUILD.gn and //webkit/glue/resources target, * which is much more inline with the GN philosophy. BUG=400860 TEST=gn gen out/Debug_gn && ninja -C out/Debug_gn R=brettw@chromium.org TBR=ben@chromium.org Review URL: https://codereview.chromium.org/458053002 Cr-Commit-Position: refs/heads/master@{#289163} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289163 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/BUILD.gn | 3 ++- chrome/browser/extensions/BUILD.gn | 3 ++- chrome/browser/ui/BUILD.gn | 3 ++- chrome/renderer/BUILD.gn | 3 ++- content/browser/BUILD.gn | 3 ++- content/child/BUILD.gn | 3 ++- content/common/BUILD.gn | 3 ++- content/shell/BUILD.gn | 8 +++++--- webkit/BUILD.gn | 32 -------------------------------- webkit/glue/resources/BUILD.gn | 14 ++++++++++++++ webkit/webkit_resources.gyp | 2 +- 11 files changed, 34 insertions(+), 43 deletions(-) delete mode 100644 webkit/BUILD.gn create mode 100644 webkit/glue/resources/BUILD.gn diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index cc46b34..8caaa2d 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -156,6 +156,7 @@ static_library("browser") { "//mojo/public/js/bindings", "//mojo/system", "//net:net_with_v8", + "//third_party/WebKit/public:resources", "//third_party/adobe/flash:flapper_version_h", "//third_party/expat", "//third_party/leveldatabase", @@ -168,10 +169,10 @@ static_library("browser") { "//ui/surface", "//ui/web_dialogs", "//v8", - "//webkit:resources", "//webkit/browser:storage", "//webkit/common", "//webkit/common:storage", + "//webkit/glue/resources", # TODO(GYP) #"apps", #"debugger", diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn index 6e33eda..ca05b10 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn @@ -52,6 +52,7 @@ static_library("extensions") { "//net", "//skia", "//sync", + "//third_party/WebKit/public:resources", "//third_party/cacheinvalidation", "//third_party/icu", "//third_party/leveldatabase", @@ -63,9 +64,9 @@ static_library("extensions") { "//ui/resources", "//ui/strings", "//url", - "//webkit:resources", "//webkit/browser:storage", "//webkit/common:storage", + "//webkit/glue/resources", #"debugger", TODO(GYP) #"installer_util", TODO(GYP) #"../components/components.gyp:omaha_query_params", TODO(GYP) diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index 0e92fbd..9b3fe65 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -91,6 +91,7 @@ static_library("ui") { "//media", "//mojo/system", "//net:net_with_v8", + "//third_party/WebKit/public:resources", "//third_party/adobe/flash:flapper_version_h", "//third_party/expat", "//third_party/hunspell", @@ -101,10 +102,10 @@ static_library("ui") { "//ui/surface", "//ui/web_dialogs", "//v8", - "//webkit:resources", "//webkit/browser:storage", "//webkit/common", "//webkit/common:storage", + "//webkit/glue/resources", #'debugger', TODO(GYP) #'installer_util', TODO(GYP) #'../third_party/libjingle/libjingle.gyp:libjingle', TODO(GYP) diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn index d621d24..4cde673 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -48,6 +48,7 @@ static_library("renderer") { "//net", "//skia", "//third_party/WebKit/public:blink", + "//third_party/WebKit/public:resources", "//third_party/icu", "//third_party/npapi", "//third_party/re2", @@ -56,7 +57,7 @@ static_library("renderer") { "//v8:v8", "//webkit/child", "//webkit/common", - "//webkit:resources", + "//webkit/glue/resources", #"../components/components.gyp:cdm_renderer", TODO(GYP) #"../extensions/extensions.gyp:extensions_renderer", TODO(GYP) #"../media/cast/cast.gyp:cast_sender", TODO(GYP) diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn index 04655ef..c30dea0 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -97,16 +97,17 @@ source_set("browser") { "//mojo/public/interfaces/application", "//mojo/public/js/bindings", "//net:http_server", + "//third_party/WebKit/public:resources", "//third_party/angle:commit_id", "//third_party/icu", "//third_party/leveldatabase", "//third_party/libyuv", "//ui/resources", "//ui/surface", - "//webkit:resources", "//webkit/browser:storage", "//webkit/common", "//webkit/common:storage", + "//webkit/glue/resources", ] } diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn index c6ec390..fc02378 100644 --- a/content/child/BUILD.gn +++ b/content/child/BUILD.gn @@ -90,10 +90,11 @@ source_set("child") { "//content/app/strings", "//crypto:platform", "//third_party/WebKit/public:blink", + "//third_party/WebKit/public:resources", "//third_party/npapi", - "//webkit:resources", "//webkit/child", "//webkit/common", + "//webkit/glue/resources", ] } diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn index 0f2a380..152a9f7 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -96,8 +96,9 @@ source_set("common") { ] deps += [ - "//webkit:resources", "//content:resources", + "//third_party/WebKit/public:resources", + "//webkit/glue/resources", ] libs += [ "QuartzCore.framework" ] } diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn index 22df868..3588691 100644 --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn @@ -222,9 +222,10 @@ static_library("content_shell_lib") { "//net", "//net:net_resources", "//skia", - "//third_party/icu", "//third_party/WebKit/public:blink", + "//third_party/WebKit/public:resources", "//third_party/WebKit/public:test_support", + "//third_party/icu", "//ui/base", "//ui/events:events_base", "//ui/gfx", @@ -233,8 +234,8 @@ static_library("content_shell_lib") { "//ui/gl", "//url", "//v8", - "//webkit:resources", "//webkit/browser:storage", + "//webkit/glue/resources", #'copy_test_netscape_plugin', TODO(GYP) ] @@ -407,9 +408,10 @@ repack("pak") { "//content/app/strings", "//content/browser/tracing:resources", "//net:net_resources", + "//third_party/WebKit/public:resources", "//ui/resources", "//ui/strings", - "//webkit:resources", + "//webkit/glue/resources", ] if (is_android) { diff --git a/webkit/BUILD.gn b/webkit/BUILD.gn deleted file mode 100644 index c6aef8e..0000000 --- a/webkit/BUILD.gn +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//tools/grit/grit_rule.gni") - -group("resources") { - deps = [ - ":webkit_resources_action", - ":blink_common_resources", - ] -} - -grit("webkit_resources_action") { - visibility = ":resources" - source = "glue/resources/webkit_resources.grd" - outputs = [ - "grit/webkit_resources.h", - "webkit_resources_100_percent.pak", - "webkit_resources_200_percent.pak", - ] -} - -grit("blink_common_resources") { - visibility = ":resources" - source = "//third_party/WebKit/public/blink_resources.grd" - outputs = [ - "grit/blink_resources.h", - "blink_resources.rc", - "blink_resources.pak", - ] -} diff --git a/webkit/glue/resources/BUILD.gn b/webkit/glue/resources/BUILD.gn new file mode 100644 index 0000000..f0e64f4 --- /dev/null +++ b/webkit/glue/resources/BUILD.gn @@ -0,0 +1,14 @@ +# Copyright 2014 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//tools/grit/grit_rule.gni") + +grit("resources") { + source = "webkit_resources.grd" + outputs = [ + "grit/webkit_resources.h", + "webkit_resources_100_percent.pak", + "webkit_resources_200_percent.pak", + ] +} diff --git a/webkit/webkit_resources.gyp b/webkit/webkit_resources.gyp index f0eb6be..e7dac60c 100644 --- a/webkit/webkit_resources.gyp +++ b/webkit/webkit_resources.gyp @@ -5,7 +5,7 @@ { 'targets': [ { - # GN version: //webkit:resources + # GN version: //webkit/glue/resources 'target_name': 'webkit_resources', 'type': 'none', 'variables': { -- cgit v1.1