Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 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 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'apps', | 8 'target_name': 'apps', |
| 9 'type': 'static_library', | 9 'type': 'static_library', |
| 10 'variables': { 'enable_wexit_time_destructors': 1, }, | 10 'variables': { 'enable_wexit_time_destructors': 1, }, |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 96 'msvs_disabled_warnings': [ 4267, ], | 96 'msvs_disabled_warnings': [ 4267, ], |
| 97 }, | 97 }, |
| 98 ], # targets | 98 ], # targets |
| 99 'conditions': [ | 99 'conditions': [ |
| 100 ['chromeos==1 or (OS=="linux" and use_aura==1) or (OS=="win" and use_aura==1 )', { | 100 ['chromeos==1 or (OS=="linux" and use_aura==1) or (OS=="win" and use_aura==1 )', { |
| 101 'targets': [ | 101 'targets': [ |
| 102 { | 102 { |
| 103 'target_name': 'app_shell_pak', | 103 'target_name': 'app_shell_pak', |
| 104 'type': 'none', | 104 'type': 'none', |
| 105 'dependencies': [ | 105 'dependencies': [ |
| 106 # Need dev-tools related resources in shell_resources.pak and devtoo ls_resources.pak. | 106 # Need extension related resources in common_resources.pak and |
| 107 # renderer_resources_100_percent.pak | |
| 108 'chrome_resources.gyp:chrome_resources', | |
| 109 # Need app related resources in theme_resources_100_percent.pak | |
| 110 'chrome_resources.gyp:theme_resources', | |
| 111 # Need dev-tools related resources in shell_resources.pak and | |
| 112 # devtools_resources.pak. | |
| 107 '../content/content_shell_and_tests.gyp:generate_content_shell_resou rces', | 113 '../content/content_shell_and_tests.gyp:generate_content_shell_resou rces', |
| 108 '../content/browser/devtools/devtools_resources.gyp:devtools_resourc es', | 114 '../content/browser/devtools/devtools_resources.gyp:devtools_resourc es', |
| 109 # Need features JSON files in common_resources.pak. | 115 '../ui/base/strings/ui_strings.gyp:ui_strings', |
| 110 'chrome_resources.gyp:chrome_resources', | 116 '../ui/resources/ui_resources.gyp:ui_resources', |
| 111 ], | 117 ], |
| 112 'variables': { | 118 'variables': { |
| 113 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py', | 119 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py', |
| 114 }, | 120 }, |
| 115 'actions': [ | 121 'actions': [ |
| 116 { | 122 { |
| 117 'action_name': 'repack_app_shell_pack', | 123 'action_name': 'repack_app_shell_pack', |
| 118 'variables': { | 124 'variables': { |
| 119 'pak_inputs': [ | 125 'pak_inputs': [ |
| 120 '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak', | |
| 121 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', | |
| 122 '<(grit_out_dir)/common_resources.pak', | 126 '<(grit_out_dir)/common_resources.pak', |
| 123 '<(grit_out_dir)/extensions_api_resources.pak', | 127 '<(grit_out_dir)/extensions_api_resources.pak', |
| 128 '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_en-US.p ak', | |
| 129 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_perc ent.pak', | |
| 130 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent .pak', | |
|
tony
2014/03/05 18:08:44
Does app shell really need strings from generated_
Haojian Wu
2014/03/06 04:37:17
The app_window will need the IDR_APP_WINDOW_* in t
| |
| 131 '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak', | |
| 132 '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_ settings_en-US.pak', | |
| 133 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_p ercent.pak', | |
| 134 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak ', | |
| 135 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', | |
| 124 ], | 136 ], |
| 125 }, | 137 }, |
| 126 'inputs': [ | 138 'inputs': [ |
| 127 '<(repack_path)', | 139 '<(repack_path)', |
| 128 '<@(pak_inputs)', | 140 '<@(pak_inputs)', |
| 129 ], | 141 ], |
| 130 'outputs': [ | 142 'outputs': [ |
| 131 '<(PRODUCT_DIR)/app_shell.pak', | 143 '<(PRODUCT_DIR)/app_shell.pak', |
| 132 ], | 144 ], |
| 133 'action': ['python', '<(repack_path)', '<@(_outputs)', | 145 'action': ['python', '<(repack_path)', '<@(_outputs)', |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 199 'dependencies': [ | 211 'dependencies': [ |
| 200 '../sandbox/sandbox.gyp:sandbox', | 212 '../sandbox/sandbox.gyp:sandbox', |
| 201 ], | 213 ], |
| 202 }], | 214 }], |
| 203 ], | 215 ], |
| 204 }, | 216 }, |
| 205 ], # targets | 217 ], # targets |
| 206 }], # chromeos==1 | 218 }], # chromeos==1 |
| 207 ], # conditions | 219 ], # conditions |
| 208 } | 220 } |
| OLD | NEW |