summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-29 20:45:25 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-29 20:45:25 +0000
commit858a79c8d042ea5a3101ba37f496f6da8ec2185f (patch)
tree63b38f923ac70c000270bd03f95674798c8ef244 /chrome
parent253a39adbfb946eba237c7021288e511da8da0ca (diff)
downloadchromium_src-858a79c8d042ea5a3101ba37f496f6da8ec2185f.zip
chromium_src-858a79c8d042ea5a3101ba37f496f6da8ec2185f.tar.gz
chromium_src-858a79c8d042ea5a3101ba37f496f6da8ec2185f.tar.bz2
Deps roll to pick up the new GYP.
Put the chrome pdfs back in the mac_bundle_resources list since rules now match there also. TEST=none BUG=none Review URL: http://codereview.chromium.org/112071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17230 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/chrome.gyp25
1 files changed, 11 insertions, 14 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 9df69c0..fc43351 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -2113,7 +2113,15 @@
'app/nibs/en.lproj/TabContents.xib',
'app/nibs/en.lproj/TabView.xib',
'app/nibs/en.lproj/Toolbar.xib',
+ 'app/theme/back.pdf',
+ 'app/theme/close_bar.pdf',
+ 'app/theme/close_bar_h.pdf',
+ 'app/theme/close_bar_p.pdf',
+ 'app/theme/forward.pdf',
+ 'app/theme/go.pdf',
'app/theme/grow_box.png',
+ 'app/theme/nav.pdf',
+ 'app/theme/newtab.pdf',
'app/theme/o2_globe.png',
'app/theme/o2_history.png',
'app/theme/o2_more.png',
@@ -2121,6 +2129,9 @@
'app/theme/o2_star.png',
'app/theme/reload.pdf',
'app/theme/sadtab.png',
+ 'app/theme/star.pdf',
+ 'app/theme/starred.pdf',
+ 'app/theme/stop.pdf',
'../app/resources/throbber.png',
'app/theme/throbber_waiting.png',
'app/app-Info.plist',
@@ -2230,19 +2241,6 @@
'CHROMIUM_SHORT_NAME': '<(branding)',
},
# Bring in pdfsqueeze and run it on all pdfs
- 'sources': [
- 'app/theme/back.pdf',
- 'app/theme/close_bar.pdf',
- 'app/theme/close_bar_h.pdf',
- 'app/theme/close_bar_p.pdf',
- 'app/theme/forward.pdf',
- 'app/theme/go.pdf',
- 'app/theme/nav.pdf',
- 'app/theme/newtab.pdf',
- 'app/theme/star.pdf',
- 'app/theme/starred.pdf',
- 'app/theme/stop.pdf',
- ],
'dependencies': [
'../build/temp_gyp/pdfsqueeze.gyp:pdfsqueeze',
],
@@ -2258,7 +2256,6 @@
],
'action': ['<(PRODUCT_DIR)/pdfsqueeze', '<(RULE_INPUT_PATH)', '<@(_outputs)'],
'message': 'Running pdfsqueeze on <(RULE_INPUT_PATH)',
- 'process_outputs_as_mac_bundle_resources': 1,
},
],
}, { # else: OS != "mac"