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

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

Issue 794943003: Separate X11 implementation of touch log source (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot rebase 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 | « no previous file | chrome/browser/chromeos/system_logs/touch_log_source.h » ('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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 ".", 138 ".",
139 "//chrome") + 139 "//chrome") +
140 rebase_path(gypi_values.browser_chromeos_extension_non_athena_sources, 140 rebase_path(gypi_values.browser_chromeos_extension_non_athena_sources,
141 ".", 141 ".",
142 "//chrome") 142 "//chrome")
143 } 143 }
144 144
145 if (use_x11) { 145 if (use_x11) {
146 configs += [ "//build/config/linux:x11" ] 146 configs += [ "//build/config/linux:x11" ]
147 deps += [ "//ui/events/devices" ] 147 deps += [ "//ui/events/devices" ]
148 sources -= [ "system/input_device_settings_impl_ozone.cc" ] 148 sources -= [
149 "system/input_device_settings_impl_ozone.cc",
150 "system_logs/touch_log_source_ozone.cc",
151 ]
149 } else { 152 } else {
150 assert(use_ozone, "Either use_x11 or use_ozone has to be specified.") 153 assert(use_ozone, "Either use_x11 or use_ozone has to be specified.")
151 deps += [ "//ui/ozone" ] 154 deps += [ "//ui/ozone" ]
152 sources -= [ 155 sources -= [
153 "device_uma.cc", 156 "device_uma.cc",
154 "device_uma.h", 157 "device_uma.h",
155 "events/system_key_event_listener.cc", 158 "events/system_key_event_listener.cc",
156 "events/system_key_event_listener.h", 159 "events/system_key_event_listener.h",
157 "events/xinput_hierarchy_changed_event_listener.cc", 160 "events/xinput_hierarchy_changed_event_listener.cc",
158 "events/xinput_hierarchy_changed_event_listener.h", 161 "events/xinput_hierarchy_changed_event_listener.h",
159 "system/input_device_settings_impl_x11.cc", 162 "system/input_device_settings_impl_x11.cc",
163 "system_logs/touch_log_source_x11.cc",
160 ] 164 ]
161 } 165 }
162 166
163 if (use_cras) { 167 if (use_cras) {
164 defines += [ "USE_CRAS" ] 168 defines += [ "USE_CRAS" ]
165 } 169 }
166 170
167 if (ui_compositor_image_transport) { 171 if (ui_compositor_image_transport) {
168 deps += [ "//ui/gl" ] 172 deps += [ "//ui/gl" ]
169 } 173 }
(...skipping 11 matching lines...) Expand all
181 "policy/proto/install_attributes.proto", 185 "policy/proto/install_attributes.proto",
182 ] 186 ]
183 } 187 }
184 188
185 proto_library("attestation_proto") { 189 proto_library("attestation_proto") {
186 sources = [ 190 sources = [
187 "attestation/attestation_key_payload.proto", 191 "attestation/attestation_key_payload.proto",
188 "attestation/attestation_signed_data.proto", 192 "attestation/attestation_signed_data.proto",
189 ] 193 ]
190 } 194 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/system_logs/touch_log_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698