Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5742)

Unified Diff: chrome/chrome_repack_resources.gypi

Issue 11189031: Add iOS support to the chrome/ resource gyp/gypi files (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_repack_pseudo_locales.gypi ('k') | chrome/chrome_resources.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_repack_resources.gypi
diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi
index 792a1b18d0ea01fb7341d2e24ad7d219a7ff0ccf..a785af6a544d7f0ca2deff8b601343d82947bdab 100644
--- a/chrome/chrome_repack_resources.gypi
+++ b/chrome/chrome_repack_resources.gypi
@@ -5,17 +5,21 @@
'action_name': 'repack_resources',
'variables': {
'pak_inputs': [
- '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
- '<(grit_out_dir)/component_extension_resources.pak',
- '<(grit_out_dir)/devtools_discovery_page_resources.pak',
- '<(grit_out_dir)/net_internals_resources.pak',
- '<(grit_out_dir)/options_resources.pak',
- '<(grit_out_dir)/quota_internals_resources.pak',
'<(grit_out_dir)/shared_resources.pak',
'<(grit_out_dir)/sync_internals_resources.pak',
],
'conditions': [
- ['OS != "mac"', {
+ ['OS != "ios"', {
+ 'pak_inputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
+ '<(grit_out_dir)/component_extension_resources.pak',
+ '<(grit_out_dir)/devtools_discovery_page_resources.pak',
+ '<(grit_out_dir)/net_internals_resources.pak',
+ '<(grit_out_dir)/options_resources.pak',
+ '<(grit_out_dir)/quota_internals_resources.pak',
+ ],
+ }],
+ ['OS != "mac" and OS != "ios"', {
'pak_inputs': [
'<(grit_out_dir)/quota_internals_resources.pak',
],
« no previous file with comments | « chrome/chrome_repack_pseudo_locales.gypi ('k') | chrome/chrome_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698