summaryrefslogtreecommitdiffstats
path: root/chrome/installer/util
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-01 17:02:42 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-01 17:02:42 +0000
commitbc7510e8fe223a2b3003e129317eedf6fd267ec3 (patch)
tree94c1f36c9eecf79eecffe391b05a72cd5ce4cc19 /chrome/installer/util
parent2449703fd43147babd98ad124a396c445c3c3daf (diff)
downloadchromium_src-bc7510e8fe223a2b3003e129317eedf6fd267ec3.zip
chromium_src-bc7510e8fe223a2b3003e129317eedf6fd267ec3.tar.gz
chromium_src-bc7510e8fe223a2b3003e129317eedf6fd267ec3.tar.bz2
Fix make build by making sure .pak files are listed as outputs of grd files.
Specifically: 1) In webkit.gyp and test_shell.gyp, convert the rules to actions because of different grd outputs (localized grd files have locale in the .pak filename). 2) In chrome, make two targets each with a custom rule. One target is for localized resources, the other for non-localized resources. This is like the current windows build. Review URL: http://codereview.chromium.org/100174 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15059 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util')
-rw-r--r--chrome/installer/util/util.gyp3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/installer/util/util.gyp b/chrome/installer/util/util.gyp
index f823887..f3be1a9 100644
--- a/chrome/installer/util/util.gyp
+++ b/chrome/installer/util/util.gyp
@@ -9,7 +9,8 @@
'dependencies': [
'prebuild/util_prebuild.gyp:installer_util_prebuild',
'../../chrome.gyp:common',
- '../../chrome.gyp:resources',
+ '../../chrome.gyp:chrome_resources',
+ '../../chrome.gyp:chrome_strings',
'../../../net/net.gyp:net_resources',
'../../../media/media.gyp:media',
'../../../skia/skia.gyp:skia',