| 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 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'extensions_resources', | 8 'target_name': 'extensions_resources', |
| 9 'type': 'none', | 9 'type': 'none', |
| 10 'dependencies': [ | |
| 11 '../device/serial/serial.gyp:device_serial_mojo', | |
| 12 ], | |
| 13 'variables': { | 10 'variables': { |
| 14 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/extensions', | 11 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/extensions', |
| 15 }, | 12 }, |
| 16 'actions': [ | 13 'actions': [ |
| 17 { | 14 { |
| 18 'action_name': 'generate_extensions_resources', | 15 'action_name': 'generate_extensions_resources', |
| 19 'variables': { | 16 'variables': { |
| 20 'grit_grd_file': 'extensions_resources.grd', | 17 'grit_grd_file': 'extensions_resources.grd', |
| 21 }, | 18 }, |
| 22 'includes': [ '../build/grit_action.gypi' ], | 19 'includes': [ '../build/grit_action.gypi' ], |
| 23 }, | 20 }, |
| 24 { | 21 { |
| 25 'action_name': 'generate_extensions_renderer_resources', | 22 'action_name': 'generate_extensions_renderer_resources', |
| 26 'variables': { | 23 'variables': { |
| 27 'grit_grd_file': 'renderer/resources/extensions_renderer_resources.g
rd', | 24 'grit_grd_file': 'renderer/resources/extensions_renderer_resources.g
rd', |
| 28 'grit_additional_defines': [ | 25 'grit_additional_defines': [ |
| 29 '-E', 'mojom_root=<(SHARED_INTERMEDIATE_DIR)', | 26 '-E', 'mojom_root=<(SHARED_INTERMEDIATE_DIR)', |
| 30 ], | 27 ], |
| 31 }, | 28 }, |
| 32 'includes': [ '../build/grit_action.gypi' ], | 29 'includes': [ '../build/grit_action.gypi' ], |
| 33 }, | 30 }, |
| 34 ], | 31 ], |
| 35 'includes': [ '../build/grit_target.gypi' ], | 32 'includes': [ '../build/grit_target.gypi' ], |
| 33 'conditions': [ |
| 34 ['enable_extensions==1', { |
| 35 'dependencies': [ |
| 36 '../device/serial/serial.gyp:device_serial_mojo', |
| 37 ], |
| 38 }], |
| 39 ], |
| 36 } | 40 } |
| 37 ] | 41 ] |
| 38 } | 42 } |
| OLD | NEW |