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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_repack_chrome_100_percent.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: 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_chrome.gypi ('k') | chrome/chrome_repack_chrome_200_percent.gypi » ('j') | chrome/chrome_resources.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_repack_chrome_100_percent.gypi
diff --git a/chrome/chrome_repack_chrome_100_percent.gypi b/chrome/chrome_repack_chrome_100_percent.gypi
index b9bce3632418d85fa8eff17749213449e218b0cf..5aeeb8523010e448d6cb85e03a1bbf54376aaa13 100644
--- a/chrome/chrome_repack_chrome_100_percent.gypi
+++ b/chrome/chrome_repack_chrome_100_percent.gypi
@@ -8,9 +8,13 @@
'<(grit_out_dir)/renderer_resources_100_percent.pak',
'<(grit_out_dir)/theme_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
- '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
],
'conditions': [
+ ['OS != "ios"', {
+ 'pak_inputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
+ ],
+ }],
['use_aura==1', {
'pak_inputs': [
'<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_resources_100_percent.pak',
« no previous file with comments | « chrome/chrome_repack_chrome.gypi ('k') | chrome/chrome_repack_chrome_200_percent.gypi » ('j') | chrome/chrome_resources.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698