Commit 858a79c8 authored by thomasvl@chromium.org's avatar thomasvl@chromium.org

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
parent 253a39ad
...@@ -26,7 +26,7 @@ deps = { ...@@ -26,7 +26,7 @@ deps = {
# TODO(mark): Remove once this has moved into depot_tools. # TODO(mark): Remove once this has moved into depot_tools.
"src/tools/gyp": "src/tools/gyp":
"http://gyp.googlecode.com/svn/trunk@501", "http://gyp.googlecode.com/svn/trunk@504",
"src/v8": "src/v8":
"http://v8.googlecode.com/svn/trunk@2080", "http://v8.googlecode.com/svn/trunk@2080",
......
...@@ -2113,7 +2113,15 @@ ...@@ -2113,7 +2113,15 @@
'app/nibs/en.lproj/TabContents.xib', 'app/nibs/en.lproj/TabContents.xib',
'app/nibs/en.lproj/TabView.xib', 'app/nibs/en.lproj/TabView.xib',
'app/nibs/en.lproj/Toolbar.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/grow_box.png',
'app/theme/nav.pdf',
'app/theme/newtab.pdf',
'app/theme/o2_globe.png', 'app/theme/o2_globe.png',
'app/theme/o2_history.png', 'app/theme/o2_history.png',
'app/theme/o2_more.png', 'app/theme/o2_more.png',
...@@ -2121,6 +2129,9 @@ ...@@ -2121,6 +2129,9 @@
'app/theme/o2_star.png', 'app/theme/o2_star.png',
'app/theme/reload.pdf', 'app/theme/reload.pdf',
'app/theme/sadtab.png', 'app/theme/sadtab.png',
'app/theme/star.pdf',
'app/theme/starred.pdf',
'app/theme/stop.pdf',
'../app/resources/throbber.png', '../app/resources/throbber.png',
'app/theme/throbber_waiting.png', 'app/theme/throbber_waiting.png',
'app/app-Info.plist', 'app/app-Info.plist',
...@@ -2230,19 +2241,6 @@ ...@@ -2230,19 +2241,6 @@
'CHROMIUM_SHORT_NAME': '<(branding)', 'CHROMIUM_SHORT_NAME': '<(branding)',
}, },
# Bring in pdfsqueeze and run it on all pdfs # 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': [ 'dependencies': [
'../build/temp_gyp/pdfsqueeze.gyp:pdfsqueeze', '../build/temp_gyp/pdfsqueeze.gyp:pdfsqueeze',
], ],
...@@ -2258,7 +2256,6 @@ ...@@ -2258,7 +2256,6 @@
], ],
'action': ['<(PRODUCT_DIR)/pdfsqueeze', '<(RULE_INPUT_PATH)', '<@(_outputs)'], 'action': ['<(PRODUCT_DIR)/pdfsqueeze', '<(RULE_INPUT_PATH)', '<@(_outputs)'],
'message': 'Running pdfsqueeze on <(RULE_INPUT_PATH)', 'message': 'Running pdfsqueeze on <(RULE_INPUT_PATH)',
'process_outputs_as_mac_bundle_resources': 1,
}, },
], ],
}, { # else: OS != "mac" }, { # else: OS != "mac"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment