| 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 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 }, | 8 }, |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| 11 'target_name': 'ui_chromeos_resources', | 11 'target_name': 'ui_chromeos_resources', |
| 12 'type': 'none', | 12 'type': 'none', |
| 13 'hard_dependency': 1, |
| 13 'variables': { | 14 'variables': { |
| 14 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources', | 15 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources', |
| 15 }, | 16 }, |
| 16 'actions': [ | 17 'actions': [ |
| 17 { | 18 { |
| 18 'action_name': 'ui_chromeos_resources', | 19 'action_name': 'ui_chromeos_resources', |
| 19 'variables': { | 20 'variables': { |
| 20 'grit_grd_file': 'resources/ui_chromeos_resources.grd', | 21 'grit_grd_file': 'resources/ui_chromeos_resources.grd', |
| 21 }, | 22 }, |
| 22 'includes': [ '../../build/grit_action.gypi' ], | 23 'includes': [ '../../build/grit_action.gypi' ], |
| 23 }, | 24 }, |
| 24 ], | 25 ], |
| 25 'includes': [ '../../build/grit_target.gypi' ], | 26 'includes': [ '../../build/grit_target.gypi' ], |
| 26 }, # target_name: ui_chromeos_resources | 27 }, # target_name: ui_chromeos_resources |
| 27 { | 28 { |
| 28 'target_name': 'ui_chromeos_strings', | 29 'target_name': 'ui_chromeos_strings', |
| 29 'type': 'none', | 30 'type': 'none', |
| 31 'hard_dependency': 1, |
| 30 'variables': { | 32 'variables': { |
| 31 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings', | 33 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings', |
| 32 }, | 34 }, |
| 33 'actions': [ | 35 'actions': [ |
| 34 { | 36 { |
| 35 'action_name': 'generate_ui_chromeos_strings', | 37 'action_name': 'generate_ui_chromeos_strings', |
| 36 'variables': { | 38 'variables': { |
| 37 'grit_grd_file': 'ui_chromeos_strings.grd', | 39 'grit_grd_file': 'ui_chromeos_strings.grd', |
| 38 }, | 40 }, |
| 39 'includes': [ '../../build/grit_action.gypi' ], | 41 'includes': [ '../../build/grit_action.gypi' ], |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 '../chromeos/ime/candidate_window_view_unittest.cc', | 129 '../chromeos/ime/candidate_window_view_unittest.cc', |
| 128 '../chromeos/ime/input_method_menu_item_unittest.cc', | 130 '../chromeos/ime/input_method_menu_item_unittest.cc', |
| 129 '../chromeos/ime/input_method_menu_manager_unittest.cc', | 131 '../chromeos/ime/input_method_menu_manager_unittest.cc', |
| 130 '../chromeos/network/network_state_notifier_unittest.cc', | 132 '../chromeos/network/network_state_notifier_unittest.cc', |
| 131 '../chromeos/touch_exploration_controller_unittest.cc', | 133 '../chromeos/touch_exploration_controller_unittest.cc', |
| 132 'run_all_unittests.cc', | 134 'run_all_unittests.cc', |
| 133 ], | 135 ], |
| 134 }, # target_name: ui_chromeos_unittests | 136 }, # target_name: ui_chromeos_unittests |
| 135 ], | 137 ], |
| 136 } | 138 } |
| OLD | NEW |