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

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

Issue 1089773003: Revert of Fix errors found in Mac gn component builds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/surface/surface.gyp ('k') | ui/views/views.gyp » ('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("//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 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 sources += gypi_values.views_desktop_aura_ozone_sources 112 sources += gypi_values.views_desktop_aura_ozone_sources
113 } 113 }
114 if (is_linux) { 114 if (is_linux) {
115 sources += gypi_values.views_desktop_aura_linux_sources 115 sources += gypi_values.views_desktop_aura_linux_sources
116 } 116 }
117 } 117 }
118 } 118 }
119 119
120 if (is_mac) { 120 if (is_mac) {
121 deps += [ "//ui/accelerated_widget_mac" ] 121 deps += [ "//ui/accelerated_widget_mac" ]
122 libs = [
123 # Required by bridged_native_widget.mm.
124 "QuartzCore.framework",
125 ]
126 } 122 }
127 } 123 }
128 124
129 static_library("test_support") { 125 static_library("test_support") {
130 testonly = true 126 testonly = true
131 sources = gypi_values.views_test_support_sources 127 sources = gypi_values.views_test_support_sources
132 128
133 public_deps = [ 129 public_deps = [
134 ":views", 130 ":views",
135 ] 131 ]
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 "//base/test:test_support", 280 "//base/test:test_support",
285 "//skia", 281 "//skia",
286 "//testing/gtest", 282 "//testing/gtest",
287 "//ui/compositor", 283 "//ui/compositor",
288 "//ui/resources", 284 "//ui/resources",
289 "//ui/resources:ui_test_pak", 285 "//ui/resources:ui_test_pak",
290 "//ui/strings", 286 "//ui/strings",
291 ] 287 ]
292 } 288 }
293 } 289 }
OLDNEW
« no previous file with comments | « ui/surface/surface.gyp ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698