Commit 581eaa36 authored by Robert Sesek's avatar Robert Sesek Committed by Commit Bot

mac: Convert GN libs lists to frameworks in //gpu.

GN recently added support for Apple frameworks to link, rather than
overloading the libs lists. This pulls .frameworks out of the libs
lists, so that GN can stop supporting .frameworks in libs in the
future.

Bug: 1052560
Change-Id: I172aa483c71f880b78668f857b8378ee1b9fe562
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2276659
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Auto-Submit: Robert Sesek <rsesek@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784493}
parent 5c82d6f1
...@@ -267,7 +267,7 @@ if (!is_android && !is_fuchsia && !is_chromeos) { ...@@ -267,7 +267,7 @@ if (!is_android && !is_fuchsia && !is_chromeos) {
defines = [ "GL_GLEXT_PROTOTYPES" ] defines = [ "GL_GLEXT_PROTOTYPES" ]
if (is_mac) { if (is_mac) {
libs = [ "IOSurface.framework" ] frameworks = [ "IOSurface.framework" ]
} }
deps = [ deps = [
......
...@@ -385,7 +385,7 @@ target(link_target_type, "gles2_sources") { ...@@ -385,7 +385,7 @@ target(link_target_type, "gles2_sources") {
] ]
# Required by gles2_cmd_decoder.cc on Mac. # Required by gles2_cmd_decoder.cc on Mac.
libs = [ frameworks = [
"Cocoa.framework", "Cocoa.framework",
"IOSurface.framework", "IOSurface.framework",
"Metal.framework", "Metal.framework",
......
...@@ -214,7 +214,7 @@ jumbo_source_set("config_sources") { ...@@ -214,7 +214,7 @@ jumbo_source_set("config_sources") {
} }
} }
if (is_mac) { if (is_mac) {
libs = [ "OpenGL.framework" ] frameworks = [ "OpenGL.framework" ]
} }
if (is_linux || is_mac) { if (is_linux || is_mac) {
deps += [ "//third_party/angle:angle_gpu_info_util" ] deps += [ "//third_party/angle:angle_gpu_info_util" ]
......
...@@ -85,7 +85,7 @@ source_set("ipc_common_sources") { ...@@ -85,7 +85,7 @@ source_set("ipc_common_sources") {
"gpu_memory_buffer_impl_io_surface.cc", "gpu_memory_buffer_impl_io_surface.cc",
"gpu_memory_buffer_impl_io_surface.h", "gpu_memory_buffer_impl_io_surface.h",
] ]
libs = [ "IOSurface.framework" ] frameworks = [ "IOSurface.framework" ]
} }
if (is_win) { if (is_win) {
sources += [ sources += [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment