Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 'chromevox_dest_dir': '<(PRODUCT_DIR)/resources/chromeos/chromevox', | 7 'chromevox_dest_dir': '<(PRODUCT_DIR)/resources/chromeos/chromevox', |
| 8 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| 11 'target_name': 'chromevox_resources', | 11 'target_name': 'chromevox_resources', |
| 12 'type': 'none', | 12 'type': 'none', |
| 13 'dependencies': [ | 13 'dependencies': [ |
| 14 'chromevox_assets', | 14 'chromevox_assets', |
| 15 'chromevox_manifest', | |
| 16 'chromevox_guest_manifest', | |
| 15 'chromevox_static_files', | 17 'chromevox_static_files', |
| 16 'chromevox_strings', | 18 'chromevox_strings', |
| 17 'chromevox_uncompiled_js_files', | 19 'chromevox_uncompiled_js_files', |
| 18 '<(DEPTH)/chrome/third_party/chromevox/chromevox.gyp:chromevox_third_par ty_resources', | 20 '<(DEPTH)/chrome/third_party/chromevox/chromevox.gyp:chromevox_third_par ty_resources', |
| 19 ], | 21 ], |
| 20 'conditions': [ | 22 'conditions': [ |
| 21 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 23 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
| 22 'dependencies': [ | 24 'dependencies': [ |
| 23 '<(DEPTH)/third_party/liblouis/liblouis_nacl.gyp:liblouis_nacl_wrapp er_nacl', | 25 '<(DEPTH)/third_party/liblouis/liblouis_nacl.gyp:liblouis_nacl_wrapp er_nacl', |
| 24 ], | 26 ], |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 174 # TODO(plundblad): Change to use PRODUCT_DIR when we have | 176 # TODO(plundblad): Change to use PRODUCT_DIR when we have |
| 175 # translations. | 177 # translations. |
| 176 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/resources/chromeos/chrom evox', | 178 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/resources/chromeos/chrom evox', |
| 177 # We don't generate any RC files, so no resource_ds file is needed. | 179 # We don't generate any RC files, so no resource_ds file is needed. |
| 178 'grit_resource_ids': '', | 180 'grit_resource_ids': '', |
| 179 }, | 181 }, |
| 180 'includes': [ '../../../../../build/grit_action.gypi' ], | 182 'includes': [ '../../../../../build/grit_action.gypi' ], |
| 181 }, | 183 }, |
| 182 ], | 184 ], |
| 183 }, | 185 }, |
| 186 { | |
| 187 'target_name': 'chromevox_manifest', | |
| 188 'type': 'none', | |
| 189 'variables': { | |
| 190 'template_manifest': 'manifest.json.jinja2', | |
| 191 'output_manifest': '<(PRODUCT_DIR)/resources/chromeos/chromevox/manifest .json', | |
|
Peter Lundblad
2014/05/23 16:04:27
Use chromevox_dest_dir here.
David Tseng
2014/05/23 19:16:37
Done.
| |
| 192 }, | |
| 193 'includes': [ 'generate_manifest.gypi', ], | |
| 194 }, | |
| 195 { | |
| 196 'target_name': 'chromevox_guest_manifest', | |
| 197 'type': 'none', | |
| 198 'variables': { | |
| 199 'template_manifest': 'manifest.json.jinja2', | |
|
Peter Lundblad
2014/05/23 16:04:27
Move this outside to avoid duplication.
David Tseng
2014/05/23 19:16:37
Done.
| |
| 200 'output_manifest': '<(PRODUCT_DIR)/resources/chromeos/chromevox/manifest _guest.json', | |
|
Peter Lundblad
2014/05/23 16:04:27
chromevox_dest_dir
David Tseng
2014/05/23 19:16:37
Done.
| |
| 201 'is_guest_manifest': 1, | |
| 202 }, | |
| 203 'includes': [ 'generate_manifest.gypi', ], | |
| 204 }, | |
| 184 ], | 205 ], |
| 185 } | 206 } |
| OLD | NEW |