summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-01 23:54:17 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-01 23:54:17 +0000
commit797b25046f036852b50520205064094bd9798c99 (patch)
tree91accfd86fc948f9adc5bd79f2e68c04f330e42a /chrome/app
parentf1650117caf47f6e7b50bcee0b201535294d9cfd (diff)
downloadchromium_src-797b25046f036852b50520205064094bd9798c99.zip
chromium_src-797b25046f036852b50520205064094bd9798c99.tar.gz
chromium_src-797b25046f036852b50520205064094bd9798c99.tar.bz2
Add more GN deps to the build.
These deps are some of those required to compile chrome/browser (so mostly those containing resources and protobufs that have generated headers). chrome/browser still has some dependencies left. Add third_party libs libaddressinput and dom_distiller_js. Add components dom_distiller and policy. Separate the generate_library_loader into a separate .gni file. Rename components_strings to just strings. R=ajwong@chromium.org Review URL: https://codereview.chromium.org/362583002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/BUILD.gn23
-rw-r--r--chrome/app/theme/BUILD.gn10
2 files changed, 33 insertions, 0 deletions
diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
index 2addc7b..9ff5c08 100644
--- a/chrome/app/BUILD.gn
+++ b/chrome/app/BUILD.gn
@@ -10,6 +10,29 @@ grit("generated_resources") {
source = "generated_resources.grd"
}
+# GYP version: chrome/chrome_resources.gyp:chrome_strings_map
+action("make_generated_resources_map") {
+ # Targets should depend on generated_resources_map instead.
+ visibility = ":generated_resources_map"
+
+ script = "//chrome/browser/metrics/variations/generate_resources_map.py"
+
+ source_prereqs = [ "$target_gen_dir/grit/generated_resources.h" ]
+ outputs = [ "$target_gen_dir/generated_resources_map.cc" ]
+
+ args = rebase_path(source_prereqs, root_build_dir) +
+ rebase_path(outputs, root_build_dir)
+
+ deps = [ ":generated_resources" ]
+}
+
+# Collect the generated .cc file from make_generated_resources_map and put it
+# in a source set so targets that depend on it will link the source rather than
+# specifying it manually. This doesn't happen in the GYP build.
+source_set("generated_resources_map") {
+ sources = get_target_outputs(":make_generated_resources_map")
+}
+
# GYP version: chrome/chrome_resources.gyp:chrome_strings
# (generate_google_chrome_strings action)
grit("google_chrome_strings") {
diff --git a/chrome/app/theme/BUILD.gn b/chrome/app/theme/BUILD.gn
index 93d3414..5e1d2a5 100644
--- a/chrome/app/theme/BUILD.gn
+++ b/chrome/app/theme/BUILD.gn
@@ -7,4 +7,14 @@ import("//tools/grit/grit_rule.gni")
# GYP version: chrome/chrome_resources.gyp:theme_resources
grit("theme_resources") {
source = "theme_resources.grd"
+
+ deps = [
+ ":chrome_unscaled_resources",
+ "//ui/resources",
+ ]
+}
+
+# GYP version: chrome/chrome_resources.gyp:chrome_unscaled_resources
+grit("chrome_unscaled_resources") {
+ source = "chrome_unscaled_resources.grd"
}