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 dev-tools related resources in shell_resources.pak and |
107 # devtools_resources.pak. | |
107 '../content/content_shell_and_tests.gyp:generate_content_shell_resou rces', | 108 '../content/content_shell_and_tests.gyp:generate_content_shell_resou rces', |
108 '../content/browser/devtools/devtools_resources.gyp:devtools_resourc es', | 109 '../content/browser/devtools/devtools_resources.gyp:devtools_resourc es', |
109 # Need features JSON files in common_resources.pak. | 110 # Need features JSON files in common_resources.pak. |
110 'chrome_resources.gyp:chrome_resources', | 111 'chrome_resources.gyp:chrome_resources', |
112 # Need view::widget resources(such as minimize button, maximize | |
113 # button, close button) in chrome_100_percent.pak. | |
114 'chrome_resources.gyp:packed_resources', | |
tony
2014/03/03 18:30:30
Rather than depending on the target in chrome, you
| |
111 ], | 115 ], |
112 'variables': { | 116 'variables': { |
113 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py', | 117 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py', |
114 }, | 118 }, |
115 'actions': [ | 119 'actions': [ |
116 { | 120 { |
117 'action_name': 'repack_app_shell_pack', | 121 'action_name': 'repack_app_shell_pack', |
118 'variables': { | 122 'variables': { |
119 'pak_inputs': [ | 123 'pak_inputs': [ |
120 '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak', | 124 '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak', |
121 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', | 125 '<(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', |
tony
2014/03/03 18:30:30
Don't you need to add the ui_resources.pak file he
| |
124 ], | 128 ], |
125 }, | 129 }, |
126 'inputs': [ | 130 'inputs': [ |
127 '<(repack_path)', | 131 '<(repack_path)', |
128 '<@(pak_inputs)', | 132 '<@(pak_inputs)', |
129 ], | 133 ], |
130 'outputs': [ | 134 'outputs': [ |
131 '<(PRODUCT_DIR)/app_shell.pak', | 135 '<(PRODUCT_DIR)/app_shell.pak', |
132 ], | 136 ], |
133 'action': ['python', '<(repack_path)', '<@(_outputs)', | 137 'action': ['python', '<(repack_path)', '<@(_outputs)', |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
199 'dependencies': [ | 203 'dependencies': [ |
200 '../sandbox/sandbox.gyp:sandbox', | 204 '../sandbox/sandbox.gyp:sandbox', |
201 ], | 205 ], |
202 }], | 206 }], |
203 ], | 207 ], |
204 }, | 208 }, |
205 ], # targets | 209 ], # targets |
206 }], # chromeos==1 | 210 }], # chromeos==1 |
207 ], # conditions | 211 ], # conditions |
208 } | 212 } |
OLD | NEW |