| 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 -= [ |
| 46 "ime/ime_keyboard_ozone.cc", |
| 47 "ime/ime_keyboard_ozone.h", |
| 48 ] |
| 46 } else { | 49 } else { |
| 47 sources -= [ | 50 sources -= [ |
| 48 "ime/ime_keyboard_x11.cc", | 51 "ime/ime_keyboard_x11.cc", |
| 49 "ime/ime_keyboard_x11.h", | 52 "ime/ime_keyboard_x11.h", |
| 50 ] | 53 ] |
| 51 } | 54 } |
| 52 } | 55 } |
| 53 | 56 |
| 54 static_library("test_support") { | 57 static_library("test_support") { |
| 55 testonly = true | 58 testonly = true |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 proto_out_dir = "chromeos/dbus/cryptohome" | 195 proto_out_dir = "chromeos/dbus/cryptohome" |
| 193 } | 196 } |
| 194 | 197 |
| 195 proto_library("cryptohome_signkey_proto") { | 198 proto_library("cryptohome_signkey_proto") { |
| 196 sources = [ | 199 sources = [ |
| 197 "//third_party/cros_system_api/dbus/cryptohome/signed_secret.proto", | 200 "//third_party/cros_system_api/dbus/cryptohome/signed_secret.proto", |
| 198 ] | 201 ] |
| 199 | 202 |
| 200 proto_out_dir = "chromeos/cryptohome" | 203 proto_out_dir = "chromeos/cryptohome" |
| 201 } | 204 } |
| OLD | NEW |