Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2012 The Chromium Authors. All rights reserved. | 1 # Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 'grit_base_dir': '<(SHARED_INTERMEDIATE_DIR)', | 8 'grit_base_dir': '<(SHARED_INTERMEDIATE_DIR)', |
| 9 'grit_out_dir': '<(grit_base_dir)/ios/chrome', | 9 'grit_out_dir': '<(grit_base_dir)/ios/chrome', |
| 10 }, | 10 }, |
| 11 'targets': [ | 11 'targets': [ |
| 12 { | 12 { |
| 13 'target_name': 'ios_packed_resources', | |
| 14 'type': 'none', | |
| 15 'dependencies': [ | |
| 16 '../../components/components_strings.gyp:components_strings', | |
| 17 '../../net/net.gyp:net_resources', | |
| 18 '../../ui/resources/ui_resources.gyp:ui_resources', | |
| 19 '../../ui/strings/ui_strings.gyp:ui_strings', | |
| 20 'ios_chrome_resources', | |
| 21 ], | |
| 22 'actions': [ | |
| 23 { | |
| 24 'action_name': 'repack_ios_locales', | |
| 25 'variables': { | |
| 26 'pak_locales': '<(locales)', | |
| 27 }, | |
| 28 'includes': ['ios_chrome_repack_locales.gypi'], | |
| 29 }, | |
| 30 { | |
| 31 '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.
| |
| 32 }, | |
| 33 { | |
| 34 'includes': ['ios_chrome_repack_200_percent.gypi'], | |
| 35 }, | |
| 36 { | |
| 37 'includes': ['ios_chrome_repack_300_percent.gypi'], | |
| 38 }, | |
| 39 ], | |
| 40 }, | |
| 41 { | |
| 42 'target_name': 'ios_packed_extra_resources', | |
| 43 'type': 'none', | |
| 44 'dependencies': [ | |
| 45 'ios_packed_resources', | |
| 46 ], | |
| 47 'actions': [ | |
| 48 { | |
| 49 'includes': ['ios_chrome_repack_resources.gypi'] | |
| 50 }, | |
| 51 ], | |
| 52 }, | |
| 53 { | |
| 13 'target_name': 'ios_chrome_resources', | 54 'target_name': 'ios_chrome_resources', |
| 14 'type': 'none', | 55 'type': 'none', |
| 15 'dependencies': [ | 56 'dependencies': [ |
| 16 'ios_strings_resources_gen', | 57 'ios_strings_resources_gen', |
| 17 'ios_theme_resources_gen', | 58 'ios_theme_resources_gen', |
| 18 ], | 59 ], |
| 19 }, | 60 }, |
| 20 { | 61 { |
| 21 'target_name': 'ios_strings_resources_gen', | 62 'target_name': 'ios_strings_resources_gen', |
| 22 'type': 'none', | 63 'type': 'none', |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 45 } | 86 } |
| 46 }, | 87 }, |
| 47 { | 88 { |
| 48 'target_name': 'ios_theme_resources_gen', | 89 'target_name': 'ios_theme_resources_gen', |
| 49 'type': 'none', | 90 'type': 'none', |
| 50 'hard_dependency': 1, | 91 'hard_dependency': 1, |
| 51 'actions': [ | 92 'actions': [ |
| 52 { | 93 { |
| 53 'action_name': 'ios_theme_resources', | 94 'action_name': 'ios_theme_resources', |
| 54 'variables': { | 95 'variables': { |
| 55 # TODO(lliabraa): Remove this whitelist. | 96 '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
| |
| 56 'grit_whitelist': '<(DEPTH)/ios/build/grit_whitelist.txt', | |
| 57 'grit_grd_file': 'app/theme/ios_theme_resources.grd', | 97 'grit_grd_file': 'app/theme/ios_theme_resources.grd', |
| 58 }, | 98 }, |
| 59 'includes': [ '../../build/grit_action.gypi' ], | 99 'includes': [ '../../build/grit_action.gypi' ], |
| 60 }, | 100 }, |
| 61 ], | 101 ], |
| 62 'includes': [ '../../build/grit_target.gypi' ], | 102 'includes': [ '../../build/grit_target.gypi' ], |
| 63 # Override the exported include-dirs; ios_theme_resources.h should only be | 103 # Override the exported include-dirs; ios_theme_resources.h should only be |
| 64 # referencable as ios/chrome/grit/ to allow DEPS-time checking of usage. | 104 # referencable as ios/chrome/grit/ to allow DEPS-time checking of usage. |
| 65 'direct_dependent_settings': { | 105 'direct_dependent_settings': { |
| 66 'include_dirs': [ | 106 'include_dirs': [ |
| 67 '<(grit_base_dir)', | 107 '<(grit_base_dir)', |
| 68 ], | 108 ], |
| 69 'include_dirs!': [ | 109 'include_dirs!': [ |
| 70 '<(grit_out_dir)', | 110 '<(grit_out_dir)', |
| 71 ], | 111 ], |
| 72 }, | 112 }, |
| 73 }, | 113 }, |
| 74 ], | 114 ], |
| 75 } | 115 } |
| 76 | 116 |
| OLD | NEW |