summaryrefslogtreecommitdiffstats
path: root/tools/gritsettings
diff options
context:
space:
mode:
authordsinclair@chromium.org <dsinclair@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-02 21:46:06 +0000
committerdsinclair@chromium.org <dsinclair@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-02 21:46:06 +0000
commit479bea2b5cac4accf53c2cd4f15cfa021d329812 (patch)
tree8f4b8e9d400b00e82e3587892e104b1cdbfb0b04 /tools/gritsettings
parent3cd05bc98b36bac8524f19e305ec1b2ba68301ea (diff)
downloadchromium_src-479bea2b5cac4accf53c2cd4f15cfa021d329812.zip
chromium_src-479bea2b5cac4accf53c2cd4f15cfa021d329812.tar.gz
chromium_src-479bea2b5cac4accf53c2cd4f15cfa021d329812.tar.bz2
Generate files needed for tracing through the build.
Currently the about_tracing.html and about_tracing.js files are all committed into the trace-viewer repo. This causes a lot of churn. With this CL, when combined with the CL on the tracing side, we generate the needed files during the chromium build. Pairs with: https://codereview.appspot.com/9126044/ BUG=trace-viewer:152 TBR=dsinclair@chromium.org (for the grit dep) Review URL: https://chromiumcodereview.appspot.com/14990007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209777 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gritsettings')
-rw-r--r--tools/gritsettings/resource_ids4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index 57c57e4..75378f6 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -194,6 +194,10 @@
"content/shell/shell_resources.grd": {
"includes": [25500],
},
+ # This file is generated during the build.
+ "<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd": {
+ "includes": [25750],
+ },
"ash/ash_strings.grd": {
"messages": [26000],
},