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

Side by Side Diff: gpu/ipc/service/BUILD.gn

Issue 2118563002: Revert of [Mac/GN] Explicitly link ApplicationServices wherever CoreGraphics is linked. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | « no previous file | media/BUILD.gn » ('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 2016 The Chromium Authors. All rights reserved. 1 # Copyright 2016 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("//testing/test.gni") 5 import("//testing/test.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 if (is_mac) { 7 if (is_mac) {
8 import("//build/config/mac/mac_sdk.gni") 8 import("//build/config/mac/mac_sdk.gni")
9 } 9 }
10 10
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 sources += [ 71 sources += [
72 "gpu_memory_buffer_factory_io_surface.cc", 72 "gpu_memory_buffer_factory_io_surface.cc",
73 "gpu_memory_buffer_factory_io_surface.h", 73 "gpu_memory_buffer_factory_io_surface.h",
74 "image_transport_surface_mac.mm", 74 "image_transport_surface_mac.mm",
75 "image_transport_surface_overlay_mac.h", 75 "image_transport_surface_overlay_mac.h",
76 "image_transport_surface_overlay_mac.mm", 76 "image_transport_surface_overlay_mac.mm",
77 ] 77 ]
78 deps += [ "//ui/accelerated_widget_mac" ] 78 deps += [ "//ui/accelerated_widget_mac" ]
79 lib_dirs = [ "$mac_sdk_path/usr/lib" ] 79 lib_dirs = [ "$mac_sdk_path/usr/lib" ]
80 libs += [ 80 libs += [
81 "ApplicationServices.framework", # Temporary hack around https://crbug.co m/620127. Remove after https://crbug.com/622481 is fixed. 81 "QuartzCore.framework",
82 "CoreGraphics.framework", 82 "CoreGraphics.framework",
83 "QuartzCore.framework",
84 ] 83 ]
85 } 84 }
86 if (is_android) { 85 if (is_android) {
87 sources += [ 86 sources += [
88 "gpu_memory_buffer_factory_surface_texture.cc", 87 "gpu_memory_buffer_factory_surface_texture.cc",
89 "gpu_memory_buffer_factory_surface_texture.h", 88 "gpu_memory_buffer_factory_surface_texture.h",
90 "image_transport_surface_android.cc", 89 "image_transport_surface_android.cc",
91 "stream_texture_android.cc", 90 "stream_texture_android.cc",
92 "stream_texture_android.h", 91 "stream_texture_android.h",
93 ] 92 ]
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 deps += [ "//ui/android:ui_java" ] 159 deps += [ "//ui/android:ui_java" ]
161 } 160 }
162 if (is_mac) { 161 if (is_mac) {
163 sources += [ "gpu_memory_buffer_factory_io_surface_unittest.cc" ] 162 sources += [ "gpu_memory_buffer_factory_io_surface_unittest.cc" ]
164 } 163 }
165 if (use_ozone) { 164 if (use_ozone) {
166 sources += [ "gpu_memory_buffer_factory_ozone_native_pixmap_unittest.cc" ] 165 sources += [ "gpu_memory_buffer_factory_ozone_native_pixmap_unittest.cc" ]
167 deps += [ "//ui/ozone" ] 166 deps += [ "//ui/ozone" ]
168 } 167 }
169 } 168 }
OLDNEW
« no previous file with comments | « no previous file | media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698