diff options
| -rw-r--r-- | chrome/chrome_repack_chrome.gypi | 8 | ||||
| -rw-r--r-- | chrome/chrome_repack_chrome_100_percent.gypi | 6 | ||||
| -rw-r--r-- | chrome/chrome_repack_chrome_200_percent.gypi | 6 | ||||
| -rw-r--r-- | chrome/chrome_repack_pseudo_locales.gypi | 4 | ||||
| -rw-r--r-- | chrome/chrome_repack_resources.gypi | 18 | ||||
| -rw-r--r-- | chrome/chrome_resources.gyp | 146 |
6 files changed, 110 insertions, 78 deletions
diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi index df183c7..d594d0e 100644 --- a/chrome/chrome_repack_chrome.gypi +++ b/chrome/chrome_repack_chrome.gypi @@ -7,11 +7,15 @@ 'pak_inputs': [ '<(grit_out_dir)/browser_resources.pak', '<(grit_out_dir)/common_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', ], 'conditions': [ + ['OS != "ios"', { + 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', + ], + }], ['enable_extensions==1', { 'pak_inputs': [ '<(grit_out_dir)/extensions_api_resources.pak', diff --git a/chrome/chrome_repack_chrome_100_percent.gypi b/chrome/chrome_repack_chrome_100_percent.gypi index b9bce36..5aeeb85 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', diff --git a/chrome/chrome_repack_chrome_200_percent.gypi b/chrome/chrome_repack_chrome_200_percent.gypi index 158b012..33e6ccc 100644 --- a/chrome/chrome_repack_chrome_200_percent.gypi +++ b/chrome/chrome_repack_chrome_200_percent.gypi @@ -8,9 +8,13 @@ '<(grit_out_dir)/renderer_resources_200_percent.pak', '<(grit_out_dir)/theme_resources_200_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_200_percent.pak', ], 'conditions': [ + ['OS != "ios"', { + 'pak_inputs': [ + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_200_percent.pak', + ], + }], ['use_aura==1', { 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_resources_200_percent.pak', diff --git a/chrome/chrome_repack_pseudo_locales.gypi b/chrome/chrome_repack_pseudo_locales.gypi index 2bb9118..340ed19 100644 --- a/chrome/chrome_repack_pseudo_locales.gypi +++ b/chrome/chrome_repack_pseudo_locales.gypi @@ -10,14 +10,14 @@ }, { # else: branding!="Chrome" 'branding_flag': ['-b', 'chromium',], }], - ] + ], }, 'inputs': [ 'tools/build/repack_locales.py', '<!@pymod_do_main(repack_locales -i -p <(OS) <(branding_flag) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(INTERMEDIATE_DIR) <(pseudo_locales))' ], 'conditions': [ - ['OS == "mac"', { + ['OS == "mac" or OS == "ios"', { 'outputs': [ '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(pseudo_locales))' ], diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi index 792a1b1..a785af6 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', ], diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index 2d533a6..fddc821 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -10,42 +10,11 @@ { 'target_name': 'chrome_extra_resources', 'type': 'none', - 'dependencies': [ - '../content/browser/debugger/devtools_resources.gyp:devtools_resources', - ], # These resources end up in resources.pak because they are resources # used by internal pages. Putting them in a spearate pak file makes # it easier for us to reference them internally. 'actions': [ { - 'action_name': 'component_extension_resources', - 'variables': { - 'grit_grd_file': 'browser/resources/component_extension_resources.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - { - 'action_name': 'net_internals_resources', - 'variables': { - 'grit_grd_file': 'browser/resources/net_internals_resources.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - { - 'action_name': 'options_resources', - 'variables': { - 'grit_grd_file': 'browser/resources/options_resources.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - { - 'action_name': 'quota_internals_resources', - 'variables': { - 'grit_grd_file': 'browser/resources/quota_internals_resources.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - }, - { 'action_name': 'shared_resources', 'variables': { 'grit_grd_file': 'browser/resources/shared_resources.grd', @@ -59,24 +28,61 @@ }, 'includes': [ '../build/grit_action.gypi' ], }, - { - 'action_name': 'devtools_discovery_page_resources', - 'variables': { - 'grit_grd_file': - 'browser/debugger/frontend/devtools_discovery_page_resources.grd', - }, - 'includes': [ '../build/grit_action.gypi' ] - }, ], 'includes': [ '../build/grit_target.gypi' ], - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/resources/extension/demo', - 'files': [ - 'browser/resources/extension_resource/demo/library.js', + 'conditions': [ + ['OS != "ios"', { + 'dependencies': [ + '../content/browser/debugger/devtools_resources.gyp:devtools_resources', ], - }, - ] + 'actions': [ + { + 'action_name': 'component_extension_resources', + 'variables': { + 'grit_grd_file': 'browser/resources/component_extension_resources.grd', + }, + 'includes': [ '../build/grit_action.gypi' ], + }, + { + 'action_name': 'net_internals_resources', + 'variables': { + 'grit_grd_file': 'browser/resources/net_internals_resources.grd', + }, + 'includes': [ '../build/grit_action.gypi' ], + }, + { + 'action_name': 'options_resources', + 'variables': { + 'grit_grd_file': 'browser/resources/options_resources.grd', + }, + 'includes': [ '../build/grit_action.gypi' ], + }, + { + 'action_name': 'quota_internals_resources', + 'variables': { + 'grit_grd_file': 'browser/resources/quota_internals_resources.grd', + }, + 'includes': [ '../build/grit_action.gypi' ], + }, + { + 'action_name': 'devtools_discovery_page_resources', + 'variables': { + 'grit_grd_file': + 'browser/debugger/frontend/devtools_discovery_page_resources.grd', + }, + 'includes': [ '../build/grit_action.gypi' ] + }, + ], + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/resources/extension/demo', + 'files': [ + 'browser/resources/extension_resource/demo/library.js', + ], + }, + ], + }], + ], }, { # TODO(mark): It would be better if each static library that needed @@ -108,13 +114,19 @@ }, 'includes': [ '../build/grit_action.gypi' ], }, - { - 'action_name': 'extensions_api_resources', - 'variables': { - 'grit_grd_file': 'common/extensions_api_resources.grd', - }, - 'includes': [ '../build/grit_action.gypi' ], - } + ], + 'conditions': [ + ['OS != "ios"', { + 'actions': [ + { + 'action_name': 'extensions_api_resources', + 'variables': { + 'grit_grd_file': 'common/extensions_api_resources.grd', + }, + 'includes': [ '../build/grit_action.gypi' ], + } + ], + }], ], 'includes': [ '../build/grit_target.gypi' ], }, @@ -178,11 +190,11 @@ }], ], },], - ['os_posix == 1 and OS != "mac" and OS != "linux"', { + ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "linux"', { 'platform_locale_settings_grd': 'app/resources/locale_settings_linux.grd', },], - ['OS=="mac"', { + ['OS == "mac" or OS == "ios"', { 'platform_locale_settings_grd': 'app/resources/locale_settings_mac.grd', }], @@ -236,7 +248,7 @@ }, ], 'conditions': [ - ['OS != "mac"', { + ['OS != "mac" and OS != "ios"', { # We'll install the resource files to the product directory. The Mac # copies the results over as bundle resources in its own special way. 'copies': [ @@ -247,8 +259,8 @@ ], }, ], - }] - ] + }], + ], }, { 'target_name': 'packed_resources', @@ -263,14 +275,9 @@ 'chrome_strings', 'platform_locale_settings', 'theme_resources', - # TODO(zork): Protect this with if use_aura==1 - '<(DEPTH)/ash/ash_strings.gyp:ash_strings', - '<(DEPTH)/content/content_resources.gyp:content_resources', '<(DEPTH)/net/net.gyp:net_resources', '<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings', '<(DEPTH)/ui/ui.gyp:ui_resources', - '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', - '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', ], 'actions': [ { @@ -299,13 +306,22 @@ }, ], 'conditions': [ + ['OS != "ios"', { + 'dependencies': [ + # TODO(zork): Protect this with if use_aura==1 + '<(DEPTH)/ash/ash_strings.gyp:ash_strings', + '<(DEPTH)/content/content_resources.gyp:content_resources', + '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', + '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', + ], + }], ['use_ash==1', { 'dependencies': [ '<(DEPTH)/ash/ash.gyp:ash_resources', '<(DEPTH)/ash/ash.gyp:ash_wallpaper_resources', ], }], - ['OS != "mac"', { + ['OS != "mac" and OS != "ios"', { # Copy pak files to the product directory. These files will be picked # up by the following installer scripts: # - Windows: chrome/installer/mini_installer/chrome.release @@ -378,7 +394,7 @@ ], }], ], # conditions - }], # end OS != "mac" + }], # end OS != "mac" and OS != "ios" ], # conditions }, ], # targets |