Commit 1b4bb703 authored by Robert Sesek's avatar Robert Sesek Committed by Commit Bot

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

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: Ida29dc452a4add2a8a7eedc7269022769a58a234
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2277970
Auto-Submit: Robert Sesek <rsesek@chromium.org>
Reviewed-by: default avatarccameron <ccameron@chromium.org>
Commit-Queue: ccameron <ccameron@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784449}
parent 30df8d48
......@@ -39,7 +39,7 @@ component("accelerated_widget_mac") {
"//ui/gl",
]
libs = [
frameworks = [
"AVFoundation.framework",
"CoreGraphics.framework",
"Foundation.framework",
......@@ -65,7 +65,7 @@ test("accelerated_widget_mac_unittests") {
"//ui/gfx:test_support",
"//ui/gl",
]
libs = [
frameworks = [
"AVFoundation.framework",
"QuartzCore.framework",
]
......
......@@ -108,7 +108,7 @@ source_set("platform") {
"ax_platform_node_mac.mm",
]
libs = [
frameworks = [
"AppKit.framework",
"Foundation.framework",
]
......
......@@ -164,7 +164,7 @@ jumbo_component("clipboard") {
if (is_mac) {
deps += [ "//third_party/mozilla" ]
libs = [
frameworks = [
"AppKit.framework",
"CoreFoundation.framework",
]
......
......@@ -77,7 +77,7 @@ component("idle") {
}
if (is_mac) {
libs = [
frameworks = [
"AppKit.framework",
"Carbon.framework",
"Foundation.framework",
......
......@@ -18,5 +18,5 @@ jumbo_component("mac") {
public_deps = [ "//ui/base/ime" ]
libs = [ "AppKit.framework" ]
frameworks = [ "AppKit.framework" ]
}
......@@ -90,7 +90,7 @@ jumbo_component("mixers") {
} else if (is_linux) {
sources += [ "linux/native_color_mixers.cc" ]
} else if (is_mac) {
libs = [ "AppKit.framework" ]
frameworks = [ "AppKit.framework" ]
sources += [
"mac/native_color_mixers.mm",
"mac/scoped_current_nsappearance.h",
......
......@@ -113,7 +113,7 @@ jumbo_component("display") {
}
if (is_mac) {
libs = [
frameworks = [
"AppKit.framework",
"CoreGraphics.framework",
"QuartzCore.framework",
......
......@@ -32,7 +32,7 @@ jumbo_component("util") {
if (is_chromeos) {
deps += [ "//ui/display/types" ]
} else if (is_mac) {
libs = [ "IOSurface.framework" ]
frameworks = [ "IOSurface.framework" ]
}
}
......
......@@ -180,7 +180,7 @@ jumbo_component("events_base") {
}
if (is_mac) {
libs = [
frameworks = [
"AppKit.framework",
"Carbon.framework",
]
......@@ -380,7 +380,7 @@ jumbo_component("events") {
}
if (is_mac) {
libs = [ "AppKit.framework" ]
frameworks = [ "AppKit.framework" ]
}
if (is_fuchsia) {
......@@ -512,7 +512,7 @@ jumbo_static_library("test_support") {
]
if (is_mac) {
libs = [ "Carbon.framework" ]
frameworks = [ "Carbon.framework" ]
}
if (use_x11 || ozone_platform_x11) {
......
......@@ -391,7 +391,7 @@ jumbo_component("gfx") {
}
if (is_mac) {
libs = [
frameworks = [
"AppKit.framework",
"CoreFoundation.framework",
"CoreGraphics.framework",
......@@ -443,7 +443,7 @@ jumbo_component("color_space") {
"mac/display_icc_profiles.cc",
"mac/display_icc_profiles.h",
]
libs = [
frameworks = [
"CoreFoundation.framework",
"CoreGraphics.framework",
]
......
......@@ -67,7 +67,7 @@ jumbo_component("animation") {
}
if (is_mac) {
libs = [
frameworks = [
"AppKit.framework",
"CoreFoundation.framework",
"CoreGraphics.framework",
......
......@@ -358,7 +358,7 @@ jumbo_component("gl") {
"scoped_cgl.h",
]
libs = [
frameworks = [
"CoreFoundation.framework",
"IOSurface.framework",
"OpenGL.framework",
......@@ -563,7 +563,7 @@ test("gl_unittests") {
if (is_mac) {
sources += [ "gl_image_io_surface_unittest.cc" ]
libs = [ "IOSurface.framework" ]
frameworks = [ "IOSurface.framework" ]
}
if (is_win) {
......
......@@ -55,7 +55,7 @@ jumbo_component("init") {
"gl_initializer_mac.cc",
]
libs = [ "OpenGL.framework" ]
frameworks = [ "OpenGL.framework" ]
} else if (use_ozone) {
sources += [
"gl_display_egl_util_ozone.cc",
......
......@@ -122,7 +122,7 @@ jumbo_component("message_center") {
"//ui/views",
]
if (is_mac) {
libs = [ "Foundation.framework" ]
frameworks = [ "Foundation.framework" ]
}
}
} else {
......
......@@ -79,7 +79,7 @@ jumbo_component("native_theme") {
]
if (is_mac) {
libs = [
frameworks = [
"CoreGraphics.framework",
"AppKit.framework",
"MediaAccessibility.framework",
......
......@@ -92,7 +92,7 @@ jumbo_component("shell_dialogs") {
}
if (is_mac) {
libs = [
frameworks = [
"CoreServices.framework",
"Foundation.framework",
"AppKit.framework",
......
......@@ -79,7 +79,7 @@ jumbo_component("snapshot") {
}
if (is_mac) {
libs = [
frameworks = [
"AppKit.framework",
"CoreGraphics.framework",
]
......
......@@ -598,7 +598,7 @@ jumbo_component("views") {
"//ui/accelerated_widget_mac",
"//ui/events:dom_keycode_converter",
]
libs = [
frameworks = [
"AppKit.framework",
"CoreGraphics.framework",
"Foundation.framework",
......
......@@ -34,7 +34,7 @@ jumbo_component("webview") {
defines = [ "WEBVIEW_IMPLEMENTATION" ]
if (is_mac) {
libs = [ "CoreFoundation.framework" ]
frameworks = [ "CoreFoundation.framework" ]
}
deps = [
......
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