| Index: ios/chrome/ios_chrome_resources.gyp
|
| diff --git a/ios/chrome/ios_chrome_resources.gyp b/ios/chrome/ios_chrome_resources.gyp
|
| index 5e99526d4676bfa342a463148a02096d2b61833d..fa003623a386ae1e55e25aa677cd241a931735fb 100644
|
| --- a/ios/chrome/ios_chrome_resources.gyp
|
| +++ b/ios/chrome/ios_chrome_resources.gyp
|
| @@ -52,8 +52,7 @@
|
| {
|
| 'action_name': 'ios_theme_resources',
|
| 'variables': {
|
| - # TODO(lliabraa): Remove this whitelist.
|
| - 'grit_whitelist': '<(DEPTH)/ios/build/grit_whitelist.txt',
|
| + 'grit_whitelist': '',
|
| 'grit_grd_file': 'app/theme/ios_theme_resources.grd',
|
| },
|
| 'includes': [ '../../build/grit_action.gypi' ],
|
| @@ -71,6 +70,93 @@
|
| ],
|
| },
|
| },
|
| + {
|
| + 'target_name': 'ios_packed_resources',
|
| + 'type': 'none',
|
| + 'dependencies': [
|
| + '../../components/components_strings.gyp:components_strings',
|
| + '../../net/net.gyp:net_resources',
|
| + '../../ui/resources/ui_resources.gyp:ui_resources',
|
| + '../../ui/strings/ui_strings.gyp:ui_strings',
|
| + 'ios_chrome_resources',
|
| + ],
|
| + 'actions': [
|
| + {
|
| + 'action_name': 'repack_ios_locales',
|
| + 'variables': {
|
| + 'repack_locales_path': 'tools/build/ios_repack_locales.py',
|
| + },
|
| + 'inputs': [
|
| + 'tools/build/ios_repack_locales.py',
|
| + '<!@pymod_do_main(ios_repack_locales -i '
|
| + '-s <(SHARED_INTERMEDIATE_DIR) '
|
| + '-x <(SHARED_INTERMEDIATE_DIR)/repack_ios '
|
| + '<(locales))'
|
| + ],
|
| + 'outputs': [
|
| + '<!@pymod_do_main(ios_repack_locales -o '
|
| + '-s <(SHARED_INTERMEDIATE_DIR) '
|
| + '-x <(SHARED_INTERMEDIATE_DIR)/repack_ios '
|
| + '<(locales))'
|
| + ],
|
| + 'action': [
|
| + 'python',
|
| + 'tools/build/ios_repack_locales.py',
|
| + '-x', '<(SHARED_INTERMEDIATE_DIR)/repack_ios',
|
| + '-s', '<(SHARED_INTERMEDIATE_DIR)',
|
| + '<@(locales)',
|
| + ],
|
| + },
|
| + {
|
| + 'action_name': 'repack_ios_resources_100_percent',
|
| + 'variables': {
|
| + 'pak_inputs': [
|
| + '<(SHARED_INTERMEDIATE_DIR)/components/components_resources_100_percent.pak',
|
| + '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/ios_theme_resources_100_percent.pak',
|
| + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
|
| + ],
|
| + 'pak_output': '<(SHARED_INTERMEDIATE_DIR)/repack_ios/chrome_100_percent.pak',
|
| + },
|
| + 'includes': [ '../../build/repack_action.gypi' ],
|
| + },
|
| + {
|
| + 'action_name': 'repack_ios_resources_200_percent',
|
| + 'variables': {
|
| + 'pak_inputs': [
|
| + '<(SHARED_INTERMEDIATE_DIR)/components/components_resources_200_percent.pak',
|
| + '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/ios_theme_resources_200_percent.pak',
|
| + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_200_percent.pak',
|
| + ],
|
| + 'pak_output': '<(SHARED_INTERMEDIATE_DIR)/repack_ios/chrome_200_percent.pak',
|
| + },
|
| + 'includes': [ '../../build/repack_action.gypi' ],
|
| + },
|
| + {
|
| + 'action_name': 'repack_ios_resources_300_percent',
|
| + 'variables': {
|
| + 'pak_inputs': [
|
| + '<(SHARED_INTERMEDIATE_DIR)/components/components_resources_300_percent.pak',
|
| + '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/ios_theme_resources_300_percent.pak',
|
| + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_300_percent.pak',
|
| + ],
|
| + 'pak_output': '<(SHARED_INTERMEDIATE_DIR)/repack_ios/chrome_300_percent.pak',
|
| + },
|
| + 'includes': [ '../../build/repack_action.gypi' ],
|
| + },
|
| + {
|
| + 'action_name': 'repack_ios_resources',
|
| + 'variables': {
|
| + 'pak_inputs': [
|
| + '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak',
|
| + '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
|
| + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
|
| + ],
|
| + 'pak_output': '<(SHARED_INTERMEDIATE_DIR)/repack_ios/resources.pak',
|
| + },
|
| + 'includes': [ '../../build/repack_action.gypi' ],
|
| + },
|
| + ],
|
| + },
|
| ],
|
| }
|
|
|
|
|