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 import("//build/config/allocator.gni") | 5 import("//build/config/allocator.gni") |
6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
7 import("//third_party/protobuf/proto_library.gni") | 7 import("//third_party/protobuf/proto_library.gni") |
8 | 8 |
9 assert(is_chromeos, "Non-ChromeOS builds must not depend on //chromeos") | 9 assert(is_chromeos, "Non-ChromeOS builds must not depend on //chromeos") |
10 | 10 |
(...skipping 27 matching lines...) Expand all Loading... |
38 ":power_manager_proto" | 38 ":power_manager_proto" |
39 ] | 39 ] |
40 sources = gypi_values.chromeos_sources | 40 sources = gypi_values.chromeos_sources |
41 defines = [ "CHROMEOS_IMPLEMENTATION" ] | 41 defines = [ "CHROMEOS_IMPLEMENTATION" ] |
42 if (use_x11) { | 42 if (use_x11) { |
43 configs += [ "//build/config/linux:x11" ] | 43 configs += [ "//build/config/linux:x11" ] |
44 deps += [ "//ui/gfx/x" ] | 44 deps += [ "//ui/gfx/x" ] |
45 sources -= [ "ime/ime_keyboard_ozone.cc" ] | 45 sources -= [ "ime/ime_keyboard_ozone.cc" ] |
46 } else { | 46 } else { |
47 sources -= [ | 47 sources -= [ |
48 "ime/keyboard_controller.cc", | |
49 "ime/ime_keyboard_x11.cc", | 48 "ime/ime_keyboard_x11.cc", |
| 49 "ime/ime_keyboard_x11.h", |
50 ] | 50 ] |
51 } | 51 } |
52 } | 52 } |
53 | 53 |
54 static_library("test_support") { | 54 static_library("test_support") { |
55 testonly = true | 55 testonly = true |
56 configs += [ | 56 configs += [ |
57 "//build/config/linux:dbus", | 57 "//build/config/linux:dbus", |
58 ] | 58 ] |
59 deps = [ | 59 deps = [ |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 ":power_manager_proto", | 155 ":power_manager_proto", |
156 ":test_support", | 156 ":test_support", |
157 ] | 157 ] |
158 sources = gypi_values.chromeos_test_sources | 158 sources = gypi_values.chromeos_test_sources |
159 if (use_allocator != "none") { | 159 if (use_allocator != "none") { |
160 deps += [ "//base/allocator" ] | 160 deps += [ "//base/allocator" ] |
161 } | 161 } |
162 if (use_x11) { | 162 if (use_x11) { |
163 deps += [ "//ui/gfx/x" ] | 163 deps += [ "//ui/gfx/x" ] |
164 } | 164 } |
| 165 if (use_ozone) { |
| 166 sources -= [ |
| 167 "ime/ime_keyboard_x11_unittest.cc", |
| 168 ] |
| 169 } |
165 } | 170 } |
166 | 171 |
167 proto_library("power_manager_proto") { | 172 proto_library("power_manager_proto") { |
168 sources = [ | 173 sources = [ |
169 "//third_party/cros_system_api/dbus/power_manager/input_event.proto", | 174 "//third_party/cros_system_api/dbus/power_manager/input_event.proto", |
170 "//third_party/cros_system_api/dbus/power_manager/peripheral_battery_status.
proto", | 175 "//third_party/cros_system_api/dbus/power_manager/peripheral_battery_status.
proto", |
171 "//third_party/cros_system_api/dbus/power_manager/policy.proto", | 176 "//third_party/cros_system_api/dbus/power_manager/policy.proto", |
172 "//third_party/cros_system_api/dbus/power_manager/power_supply_properties.pr
oto", | 177 "//third_party/cros_system_api/dbus/power_manager/power_supply_properties.pr
oto", |
173 "//third_party/cros_system_api/dbus/power_manager/suspend.proto", | 178 "//third_party/cros_system_api/dbus/power_manager/suspend.proto", |
174 ] | 179 ] |
(...skipping 10 matching lines...) Expand all Loading... |
185 proto_out_dir = "chromeos/dbus/cryptohome" | 190 proto_out_dir = "chromeos/dbus/cryptohome" |
186 } | 191 } |
187 | 192 |
188 proto_library("cryptohome_signkey_proto") { | 193 proto_library("cryptohome_signkey_proto") { |
189 sources = [ | 194 sources = [ |
190 "//third_party/cros_system_api/dbus/cryptohome/signed_secret.proto", | 195 "//third_party/cros_system_api/dbus/cryptohome/signed_secret.proto", |
191 ] | 196 ] |
192 | 197 |
193 proto_out_dir = "chromeos/cryptohome" | 198 proto_out_dir = "chromeos/cryptohome" |
194 } | 199 } |
OLD | NEW |