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

Side by Side Diff: ui/views/BUILD.gn

Issue 2251673004: remove duplicate atk GN config (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make use of use_atk instead of use_x11 Created 4 years, 4 months 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 | « ui/accessibility/BUILD.gn ('k') | no next file » | 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("//testing/test.gni") 7 import("//testing/test.gni")
8 8
9 gypi_values = exec_script("//build/gypi_to_gn.py", 9 gypi_values = exec_script("//build/gypi_to_gn.py",
10 [ rebase_path("views.gyp") ], 10 [ rebase_path("views.gyp") ],
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 113
114 if (use_aura) { 114 if (use_aura) {
115 sources += gypi_values.views_aura_sources 115 sources += gypi_values.views_aura_sources
116 deps += [ 116 deps += [
117 "//ui/aura", 117 "//ui/aura",
118 "//ui/touch_selection", 118 "//ui/touch_selection",
119 "//ui/wm", 119 "//ui/wm",
120 ] 120 ]
121 if (!is_chromeos) { 121 if (!is_chromeos) {
122 sources += gypi_values.views_desktop_aura_sources 122 sources += gypi_values.views_desktop_aura_sources
123 if (use_x11) { 123 if (use_atk) {
124 sources += gypi_values.views_desktop_aura_x11_sources 124 sources += gypi_values.views_desktop_aura_x11_sources
125 configs += [ "//ui/accessibility:atk" ] 125 configs += [ "//build/config/linux/atk" ]
126 } else if (is_win) { 126 } else if (is_win) {
127 sources += gypi_values.views_desktop_aura_win_sources 127 sources += gypi_values.views_desktop_aura_win_sources
128 } else if (use_ozone) { 128 } else if (use_ozone) {
129 sources += gypi_values.views_desktop_aura_ozone_sources 129 sources += gypi_values.views_desktop_aura_ozone_sources
130 } 130 }
131 if (is_linux) { 131 if (is_linux) {
132 sources += gypi_values.views_desktop_aura_linux_sources 132 sources += gypi_values.views_desktop_aura_linux_sources
133 } 133 }
134 } 134 }
135 } 135 }
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 "//ui/base:test_support", 325 "//ui/base:test_support",
326 "//ui/compositor", 326 "//ui/compositor",
327 "//ui/events:test_support", 327 "//ui/events:test_support",
328 "//ui/gl:test_support", 328 "//ui/gl:test_support",
329 "//ui/resources", 329 "//ui/resources",
330 "//ui/resources:ui_test_pak", 330 "//ui/resources:ui_test_pak",
331 "//ui/strings", 331 "//ui/strings",
332 ] 332 ]
333 } 333 }
334 } 334 }
OLDNEW
« no previous file with comments | « ui/accessibility/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698