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

Side by Side Diff: chrome/browser/chromeos/BUILD.gn

Issue 685793002: Move all event related devices from ui/events/ to ui/events/devices/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@internal-touchscreens
Patch Set: fix ozone Created 6 years, 1 month 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 | « athena/main/athena_launcher.cc ('k') | chrome/browser/chromeos/device_uma.cc » ('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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//components/nacl/nacl_defines.gni") 7 import("//components/nacl/nacl_defines.gni")
8 import("//media/media_options.gni") 8 import("//media/media_options.gni")
9 import("//third_party/protobuf/proto_library.gni") 9 import("//third_party/protobuf/proto_library.gni")
10 10
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 } else { 132 } else {
133 sources += rebase_path( 133 sources += rebase_path(
134 gypi_values.browser_chromeos_non_athena_sources, 134 gypi_values.browser_chromeos_non_athena_sources,
135 ".", "//chrome") + 135 ".", "//chrome") +
136 rebase_path(gypi_values.browser_chromeos_extension_non_athena_sources, 136 rebase_path(gypi_values.browser_chromeos_extension_non_athena_sources,
137 ".", "//chrome") 137 ".", "//chrome")
138 } 138 }
139 139
140 if (use_x11) { 140 if (use_x11) {
141 configs += [ "//build/config/linux:x11" ] 141 configs += [ "//build/config/linux:x11" ]
142 deps += [ "//ui/events/devices" ]
142 } else { 143 } else {
143 assert(use_ozone, "Either use_x11 or use_ozone has to be specified.") 144 assert(use_ozone, "Either use_x11 or use_ozone has to be specified.")
144 deps += [ "//ui/ozone" ] 145 deps += [ "//ui/ozone" ]
145 sources -= [ 146 sources -= [
146 "device_uma.cc", 147 "device_uma.cc",
147 "device_uma.h", 148 "device_uma.h",
148 "events/system_key_event_listener.cc", 149 "events/system_key_event_listener.cc",
149 "events/system_key_event_listener.h", 150 "events/system_key_event_listener.h",
150 "events/xinput_hierarchy_changed_event_listener.cc", 151 "events/xinput_hierarchy_changed_event_listener.cc",
151 "events/xinput_hierarchy_changed_event_listener.h", 152 "events/xinput_hierarchy_changed_event_listener.h",
(...skipping 19 matching lines...) Expand all
171 "policy/proto/install_attributes.proto", 172 "policy/proto/install_attributes.proto",
172 ] 173 ]
173 } 174 }
174 175
175 proto_library("attestation_proto") { 176 proto_library("attestation_proto") {
176 sources = [ 177 sources = [
177 "attestation/attestation_key_payload.proto", 178 "attestation/attestation_key_payload.proto",
178 "attestation/attestation_signed_data.proto", 179 "attestation/attestation_signed_data.proto",
179 ] 180 ]
180 } 181 }
OLDNEW
« no previous file with comments | « athena/main/athena_launcher.cc ('k') | chrome/browser/chromeos/device_uma.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698