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 24 matching lines...) Expand all Loading... | |
35 "//ui/accelerometer", | 35 "//ui/accelerometer", |
36 "//url", | 36 "//url", |
37 ":cryptohome_proto", | 37 ":cryptohome_proto", |
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 "ime/ime_keyboard_ozone.h"] | |
satorux1
2014/11/06 00:54:06
move ] to the next line? also put a comma at the e
FengYuan
2014/11/06 04:48:34
Done.
| |
46 } else { | 47 } else { |
47 sources -= [ | 48 sources -= [ |
48 "ime/keyboard_controller.cc", | 49 "ime/keyboard_controller.cc", |
49 "ime/ime_keyboard_x11.cc", | 50 "ime/ime_keyboard_x11.cc", |
51 "ime/ime_keyboard_x11.h", | |
50 ] | 52 ] |
51 } | 53 } |
52 } | 54 } |
53 | 55 |
54 static_library("test_support") { | 56 static_library("test_support") { |
55 testonly = true | 57 testonly = true |
56 configs += [ | 58 configs += [ |
57 "//build/config/linux:dbus", | 59 "//build/config/linux:dbus", |
58 ] | 60 ] |
59 deps = [ | 61 deps = [ |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
185 proto_out_dir = "chromeos/dbus/cryptohome" | 187 proto_out_dir = "chromeos/dbus/cryptohome" |
186 } | 188 } |
187 | 189 |
188 proto_library("cryptohome_signkey_proto") { | 190 proto_library("cryptohome_signkey_proto") { |
189 sources = [ | 191 sources = [ |
190 "//third_party/cros_system_api/dbus/cryptohome/signed_secret.proto", | 192 "//third_party/cros_system_api/dbus/cryptohome/signed_secret.proto", |
191 ] | 193 ] |
192 | 194 |
193 proto_out_dir = "chromeos/cryptohome" | 195 proto_out_dir = "chromeos/cryptohome" |
194 } | 196 } |
OLD | NEW |