Chromium Code Reviews| 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..4de9bb20f715bb2a4e6ab71e4230abb9f3376b22 100644 |
| --- a/ios/chrome/ios_chrome_resources.gyp |
| +++ b/ios/chrome/ios_chrome_resources.gyp |
| @@ -10,6 +10,47 @@ |
| }, |
| 'targets': [ |
| { |
| + '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': { |
| + 'pak_locales': '<(locales)', |
| + }, |
| + 'includes': ['ios_chrome_repack_locales.gypi'], |
| + }, |
| + { |
| + 'includes': ['ios_chrome_repack_100_percent.gypi'], |
|
droger
2015/06/05 11:04:00
Maybe inline this, since it's used in only one pla
sdefresne
2015/06/05 11:41:00
Done.
|
| + }, |
| + { |
| + 'includes': ['ios_chrome_repack_200_percent.gypi'], |
| + }, |
| + { |
| + 'includes': ['ios_chrome_repack_300_percent.gypi'], |
| + }, |
| + ], |
| + }, |
| + { |
| + 'target_name': 'ios_packed_extra_resources', |
| + 'type': 'none', |
| + 'dependencies': [ |
| + 'ios_packed_resources', |
| + ], |
| + 'actions': [ |
| + { |
| + 'includes': ['ios_chrome_repack_resources.gypi'] |
| + }, |
| + ], |
| + }, |
| + { |
| 'target_name': 'ios_chrome_resources', |
| 'type': 'none', |
| 'dependencies': [ |
| @@ -52,8 +93,7 @@ |
| { |
| 'action_name': 'ios_theme_resources', |
| 'variables': { |
| - # TODO(lliabraa): Remove this whitelist. |
| - 'grit_whitelist': '<(DEPTH)/ios/build/grit_whitelist.txt', |
| + 'grit_whitelist': '', |
|
droger
2015/06/05 09:18:37
Does this wort downstream too or will we still nee
sdefresne
2015/06/05 11:41:00
As discussed offline, this is no longer required a
|
| 'grit_grd_file': 'app/theme/ios_theme_resources.grd', |
| }, |
| 'includes': [ '../../build/grit_action.gypi' ], |