Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 The Chromium Authors. All rights reserved. |
|
Mark Mentovai
2016/06/22 21:09:05
CL description: OS X 10.7. It’s not macOS ’til 10.
Robert Sesek
2016/06/22 22:13:43
Done.
| |
| 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 |
|
Mark Mentovai
2016/06/22 21:09:05
Do we have a bug to update the DT to 10.8 or highe
Robert Sesek
2016/06/22 22:13:43
Nico just filed https://crbug.com/622481. Updated.
| |
| 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 |
| 11 group("service") { | 11 group("service") { |
| 12 if (is_component_build) { | 12 if (is_component_build) { |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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. | |
|
Mark Mentovai
2016/06/22 21:09:05
>80 OK in .gn?
Robert Sesek
2016/06/22 22:13:43
GN format didn't complain. Putting the comment abo
| |
| 82 "CoreGraphics.framework", | |
| 81 "QuartzCore.framework", | 83 "QuartzCore.framework", |
| 82 "CoreGraphics.framework", | |
| 83 ] | 84 ] |
| 84 } | 85 } |
| 85 if (is_android) { | 86 if (is_android) { |
| 86 sources += [ | 87 sources += [ |
| 87 "gpu_memory_buffer_factory_surface_texture.cc", | 88 "gpu_memory_buffer_factory_surface_texture.cc", |
| 88 "gpu_memory_buffer_factory_surface_texture.h", | 89 "gpu_memory_buffer_factory_surface_texture.h", |
| 89 "image_transport_surface_android.cc", | 90 "image_transport_surface_android.cc", |
| 90 "stream_texture_android.cc", | 91 "stream_texture_android.cc", |
| 91 "stream_texture_android.h", | 92 "stream_texture_android.h", |
| 92 ] | 93 ] |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 159 deps += [ "//ui/android:ui_java" ] | 160 deps += [ "//ui/android:ui_java" ] |
| 160 } | 161 } |
| 161 if (is_mac) { | 162 if (is_mac) { |
| 162 sources += [ "gpu_memory_buffer_factory_io_surface_unittest.cc" ] | 163 sources += [ "gpu_memory_buffer_factory_io_surface_unittest.cc" ] |
| 163 } | 164 } |
| 164 if (use_ozone) { | 165 if (use_ozone) { |
| 165 sources += [ "gpu_memory_buffer_factory_ozone_native_pixmap_unittest.cc" ] | 166 sources += [ "gpu_memory_buffer_factory_ozone_native_pixmap_unittest.cc" ] |
| 166 deps += [ "//ui/ozone" ] | 167 deps += [ "//ui/ozone" ] |
| 167 } | 168 } |
| 168 } | 169 } |
| OLD | NEW |