Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(254)

Side by Side Diff: chromeos/BUILD.gn

Issue 727143002: Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit. Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc ('k') | chromeos/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 21 matching lines...) Expand all
32 "//third_party/icu", 32 "//third_party/icu",
33 "//third_party/libxml", 33 "//third_party/libxml",
34 "//third_party/protobuf:protobuf_lite", 34 "//third_party/protobuf:protobuf_lite",
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) {
43 configs += [ "//build/config/linux:x11" ]
44 deps += [ "//ui/gfx/x" ]
45 sources -= [
46 "ime/ime_keyboard_ozone.cc",
47 "ime/ime_keyboard_ozone.h",
48 ]
49 } else {
50 sources -= [
51 "ime/ime_keyboard_x11.cc",
52 "ime/ime_keyboard_x11.h",
53 ]
54 }
55 } 42 }
56 43
57 static_library("test_support") { 44 static_library("test_support") {
58 testonly = true 45 testonly = true
59 configs += [ 46 configs += [
60 "//build/config/linux:dbus", 47 "//build/config/linux:dbus",
61 ] 48 ]
62 deps = [ 49 deps = [
63 "//testing/gmock", 50 "//testing/gmock",
64 ":chromeos", 51 ":chromeos",
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 "dbus/fake_cros_disks_client.cc", 114 "dbus/fake_cros_disks_client.cc",
128 "dbus/fake_cros_disks_client.h", 115 "dbus/fake_cros_disks_client.h",
129 "dbus/fake_power_manager_client.cc", 116 "dbus/fake_power_manager_client.cc",
130 "dbus/fake_power_manager_client.h", 117 "dbus/fake_power_manager_client.h",
131 "dbus/fake_session_manager_client.cc", 118 "dbus/fake_session_manager_client.cc",
132 "dbus/fake_session_manager_client.h", 119 "dbus/fake_session_manager_client.h",
133 "dbus/fake_shill_manager_client.cc", 120 "dbus/fake_shill_manager_client.cc",
134 "dbus/fake_shill_manager_client.h", 121 "dbus/fake_shill_manager_client.h",
135 "dbus/fake_update_engine_client.cc", 122 "dbus/fake_update_engine_client.cc",
136 "dbus/fake_update_engine_client.h", 123 "dbus/fake_update_engine_client.h",
137 "ime/fake_input_method_delegate.cc",
138 "ime/fake_input_method_delegate.h",
139 ] 124 ]
140 } 125 }
141 126
142 test("chromeos_unittests") { 127 test("chromeos_unittests") {
143 configs += [ 128 configs += [
144 "//build/config/linux:dbus", 129 "//build/config/linux:dbus",
145 "//net/third_party/nss/ssl:ssl_config", 130 "//net/third_party/nss/ssl:ssl_config",
146 ] 131 ]
147 deps = [ 132 deps = [
148 "//base/test:run_all_unittests", 133 "//base/test:run_all_unittests",
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 proto_out_dir = "chromeos/dbus/cryptohome" 182 proto_out_dir = "chromeos/dbus/cryptohome"
198 } 183 }
199 184
200 proto_library("cryptohome_signkey_proto") { 185 proto_library("cryptohome_signkey_proto") {
201 sources = [ 186 sources = [
202 "//third_party/cros_system_api/dbus/cryptohome/signed_secret.proto", 187 "//third_party/cros_system_api/dbus/cryptohome/signed_secret.proto",
203 ] 188 ]
204 189
205 proto_out_dir = "chromeos/cryptohome" 190 proto_out_dir = "chromeos/cryptohome"
206 } 191 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc ('k') | chromeos/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698