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

Side by Side Diff: ui/views/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
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 7
8 gypi_values = exec_script( 8 gypi_values = exec_script(
9 "//build/gypi_to_gn.py", 9 "//build/gypi_to_gn.py",
10 [ rebase_path("views.gyp") ], 10 [ rebase_path("views.gyp") ],
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 77
78 if (use_ozone) { 78 if (use_ozone) {
79 deps += [ "//ui/ozone" ] 79 deps += [ "//ui/ozone" ]
80 } 80 }
81 if (use_x11) { 81 if (use_x11) {
82 configs += [ 82 configs += [
83 "//build/config/linux:x11", 83 "//build/config/linux:x11",
84 "//build/config/linux:xrandr", 84 "//build/config/linux:xrandr",
85 ] 85 ]
86 deps += [ 86 deps += [
87 "//ui/events/devices",
87 "//ui/events/platform/x11", 88 "//ui/events/platform/x11",
88 "//ui/gfx/x", 89 "//ui/gfx/x",
89 ] 90 ]
90 } 91 }
91 92
92 if (use_aura) { 93 if (use_aura) {
93 sources += gypi_values.views_aura_sources 94 sources += gypi_values.views_aura_sources
94 if (!is_chromeos) { 95 if (!is_chromeos) {
95 sources += gypi_values.views_desktop_aura_sources 96 sources += gypi_values.views_desktop_aura_sources
96 if (use_x11) { 97 if (use_x11) {
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 # }, 199 # },
199 #}, 200 #},
200 } 201 }
201 202
202 if (use_x11) { 203 if (use_x11) {
203 configs += [ 204 configs += [
204 "//build/config/linux:x11", 205 "//build/config/linux:x11",
205 "//build/config/linux:xext", 206 "//build/config/linux:xext",
206 ] 207 ]
207 deps += [ 208 deps += [
209 "//ui/events/devices",
208 "//ui/events/platform/x11", 210 "//ui/events/platform/x11",
209 "//ui/gfx/x", 211 "//ui/gfx/x",
210 ] 212 ]
211 } 213 }
212 214
213 if (use_aura) { 215 if (use_aura) {
214 sources += gypi_values.views_unittests_aura_sources 216 sources += gypi_values.views_unittests_aura_sources
215 deps += [ "//ui/aura:test_support" ] 217 deps += [ "//ui/aura:test_support" ]
216 if (!is_chromeos) { 218 if (!is_chromeos) {
217 sources += gypi_values.views_unittests_desktop_aura_sources 219 sources += gypi_values.views_unittests_desktop_aura_sources
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 "//testing/gtest", 257 "//testing/gtest",
256 "//ui/aura", 258 "//ui/aura",
257 "//ui/compositor", 259 "//ui/compositor",
258 "//ui/resources", 260 "//ui/resources",
259 "//ui/resources:ui_test_pak", 261 "//ui/resources:ui_test_pak",
260 "//ui/strings", 262 "//ui/strings",
261 "//ui/wm", 263 "//ui/wm",
262 ] 264 ]
263 } 265 }
264 } 266 }
OLDNEW
« no previous file with comments | « ui/platform_window/x11/x11_window.cc ('k') | ui/views/controls/menu/menu_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698