summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_repack_chrome.gypi
diff options
context:
space:
mode:
authornduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-16 02:57:37 +0000
committernduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-16 02:57:37 +0000
commitcf9e57411d02f9328328ea4f4ec81741076891bc (patch)
tree6c55d016dc8a8e9383bbbcd3320aeb77048f7b6e /chrome/chrome_repack_chrome.gypi
parent1d309bbb24b611dd7ea78b0b471de8cf96a9a797 (diff)
downloadchromium_src-cf9e57411d02f9328328ea4f4ec81741076891bc.zip
chromium_src-cf9e57411d02f9328328ea4f4ec81741076891bc.tar.gz
chromium_src-cf9e57411d02f9328328ea4f4ec81741076891bc.tar.bz2
Fix about:tracing
This changes our browser gyp to use the exact same build process as before but just pull in about:tracing files from third_party/trace-viewer/src instead of chrome/browser/resources/. This is a quick fix to restore about:tracing, which as it turns out, people get upset about if it is broken. We can look for a more "proper" fix with this landed. BUG=132875 Review URL: https://chromiumcodereview.appspot.com/10566011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142572 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_repack_chrome.gypi')
-rw-r--r--chrome/chrome_repack_chrome.gypi1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi
index 4b0b181..6ac6632 100644
--- a/chrome/chrome_repack_chrome.gypi
+++ b/chrome/chrome_repack_chrome.gypi
@@ -9,7 +9,6 @@
'<(grit_out_dir)/common_resources.pak',
'<(grit_out_dir)/renderer_resources.pak',
'<(grit_out_dir)/theme_resources.pak',
- '<(grit_out_dir)/tracing_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.pak',