Commit 27656588 authored by Robert Sesek's avatar Robert Sesek Committed by Commit Bot

apple: Convert GN libs lists to frameworks that use `libs +=`

These were missed by the awk script I ran initially.

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: I0cf1677e1054f2ffcb54660820fba61d1c3590a6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2278363Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Reviewed-by: default avatarJohn Rummell <jrummell@chromium.org>
Reviewed-by: default avatarLambros Lambrou <lambroslambrou@chromium.org>
Reviewed-by: default avatarMartin Kreichgauer <martinkr@google.com>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786093}
parent e3cbead3
...@@ -1248,6 +1248,7 @@ jumbo_component("base") { ...@@ -1248,6 +1248,7 @@ jumbo_component("base") {
data = [] data = []
data_deps = [] data_deps = []
libs = [] libs = []
frameworks = []
configs += [ configs += [
":base_flags", ":base_flags",
...@@ -1864,14 +1865,16 @@ jumbo_component("base") { ...@@ -1864,14 +1865,16 @@ jumbo_component("base") {
] ]
libs += [ libs += [
"bsm",
"pmenergy",
"pmsample",
]
frameworks += [
"ApplicationServices.framework", "ApplicationServices.framework",
"AppKit.framework", "AppKit.framework",
"bsm",
"CoreFoundation.framework", "CoreFoundation.framework",
"IOKit.framework", "IOKit.framework",
"OpenDirectory.framework", "OpenDirectory.framework",
"pmenergy",
"pmsample",
"Security.framework", "Security.framework",
] ]
} }
...@@ -2014,7 +2017,7 @@ jumbo_component("base") { ...@@ -2014,7 +2017,7 @@ jumbo_component("base") {
sources += [ "time/time_exploded_ios.cc" ] sources += [ "time/time_exploded_ios.cc" ]
} }
libs += [ "UIKit.framework" ] frameworks += [ "UIKit.framework" ]
} }
if (dep_libevent) { if (dep_libevent) {
......
...@@ -4333,7 +4333,7 @@ static_library("browser") { ...@@ -4333,7 +4333,7 @@ static_library("browser") {
"//third_party/google_toolbox_for_mac", "//third_party/google_toolbox_for_mac",
"//third_party/mozilla", "//third_party/mozilla",
] ]
libs += [ frameworks = [
"Accelerate.framework", "Accelerate.framework",
"AudioUnit.framework", "AudioUnit.framework",
"AVFoundation.framework", "AVFoundation.framework",
......
...@@ -2895,7 +2895,7 @@ static_library("ui") { ...@@ -2895,7 +2895,7 @@ static_library("ui") {
"//ui/accelerated_widget_mac:accelerated_widget_mac", "//ui/accelerated_widget_mac:accelerated_widget_mac",
] ]
include_dirs = [ "$target_gen_dir" ] include_dirs = [ "$target_gen_dir" ]
libs += [ frameworks = [
"Carbon.framework", "Carbon.framework",
"Quartz.framework", "Quartz.framework",
] ]
......
...@@ -40,6 +40,7 @@ jumbo_source_set("browser") { ...@@ -40,6 +40,7 @@ jumbo_source_set("browser") {
] ]
defines = [] defines = []
libs = [] libs = []
frameworks = []
ldflags = [] ldflags = []
deps = [ deps = [
...@@ -2113,7 +2114,7 @@ jumbo_source_set("browser") { ...@@ -2113,7 +2114,7 @@ jumbo_source_set("browser") {
} }
if (is_mac) { if (is_mac) {
libs += [ "AppKit.framework" ] frameworks += [ "AppKit.framework" ]
sources += [ sources += [
"../app_shim_remote_cocoa/web_contents_ns_view_bridge.h", "../app_shim_remote_cocoa/web_contents_ns_view_bridge.h",
"../app_shim_remote_cocoa/web_contents_ns_view_bridge.mm", "../app_shim_remote_cocoa/web_contents_ns_view_bridge.mm",
...@@ -2592,7 +2593,7 @@ jumbo_source_set("browser") { ...@@ -2592,7 +2593,7 @@ jumbo_source_set("browser") {
"//third_party/mozilla", "//third_party/mozilla",
"//ui/accelerated_widget_mac", "//ui/accelerated_widget_mac",
] ]
libs += [ frameworks += [
"Carbon.framework", "Carbon.framework",
"QuartzCore.framework", "QuartzCore.framework",
"IOSurface.framework", "IOSurface.framework",
......
...@@ -66,8 +66,6 @@ component("fido") { ...@@ -66,8 +66,6 @@ component("fido") {
"//services/device/public/mojom", "//services/device/public/mojom",
] ]
libs = [] # Extended for mac.
# Android implementation of FIDO is delegated to GMSCore. # Android implementation of FIDO is delegated to GMSCore.
if (!is_android) { if (!is_android) {
sources += [ sources += [
...@@ -213,7 +211,7 @@ component("fido") { ...@@ -213,7 +211,7 @@ component("fido") {
"mac/util.mm", "mac/util.mm",
] ]
libs += [ frameworks = [
"Foundation.framework", "Foundation.framework",
"LocalAuthentication.framework", "LocalAuthentication.framework",
"Security.framework", "Security.framework",
......
...@@ -410,7 +410,7 @@ test("gl_tests") { ...@@ -410,7 +410,7 @@ test("gl_tests") {
deps += [ "//ui/android:ui_java" ] deps += [ "//ui/android:ui_java" ]
sources += [ "command_buffer/service/shared_image_backing_factory_ahardwarebuffer_unittest.cc" ] sources += [ "command_buffer/service/shared_image_backing_factory_ahardwarebuffer_unittest.cc" ]
} else if (is_mac) { } else if (is_mac) {
libs += [ "IOSurface.framework" ] frameworks = [ "IOSurface.framework" ]
sources += [ "command_buffer/service/shared_image_backing_factory_iosurface_unittest.cc" ] sources += [ "command_buffer/service/shared_image_backing_factory_iosurface_unittest.cc" ]
} else if (is_win) { } else if (is_win) {
deps += [ deps += [
......
...@@ -107,7 +107,7 @@ jumbo_component("service") { ...@@ -107,7 +107,7 @@ jumbo_component("service") {
] ]
deps += [ "//ui/accelerated_widget_mac" ] deps += [ "//ui/accelerated_widget_mac" ]
lib_dirs = [ "$mac_sdk_path/usr/lib" ] lib_dirs = [ "$mac_sdk_path/usr/lib" ]
libs += [ frameworks = [
"CoreGraphics.framework", "CoreGraphics.framework",
"IOSurface.framework", "IOSurface.framework",
"OpenGL.framework", "OpenGL.framework",
......
...@@ -171,7 +171,7 @@ source_set("audio") { ...@@ -171,7 +171,7 @@ source_set("audio") {
"mac/scoped_audio_unit.cc", "mac/scoped_audio_unit.cc",
"mac/scoped_audio_unit.h", "mac/scoped_audio_unit.h",
] ]
libs += [ frameworks = [
"AudioToolbox.framework", "AudioToolbox.framework",
"AudioUnit.framework", "AudioUnit.framework",
"CoreAudio.framework", "CoreAudio.framework",
......
...@@ -168,8 +168,6 @@ jumbo_source_set("sender") { ...@@ -168,8 +168,6 @@ jumbo_source_set("sender") {
"//ui/gfx/geometry", "//ui/gfx/geometry",
] ]
libs = []
# iOS and OS X encoders # iOS and OS X encoders
if (is_ios || is_mac) { if (is_ios || is_mac) {
sources += [ sources += [
...@@ -177,7 +175,7 @@ jumbo_source_set("sender") { ...@@ -177,7 +175,7 @@ jumbo_source_set("sender") {
"sender/h264_vt_encoder.h", "sender/h264_vt_encoder.h",
] ]
libs += [ frameworks = [
"AudioToolbox.framework", "AudioToolbox.framework",
"CoreFoundation.framework", "CoreFoundation.framework",
"CoreMedia.framework", "CoreMedia.framework",
......
...@@ -130,7 +130,7 @@ component("midi") { ...@@ -130,7 +130,7 @@ component("midi") {
} }
if (is_mac) { if (is_mac) {
libs += [ frameworks = [
"CoreAudio.framework", "CoreAudio.framework",
"CoreFoundation.framework", "CoreFoundation.framework",
"CoreMIDI.framework", "CoreMIDI.framework",
......
...@@ -412,7 +412,7 @@ static_library("common") { ...@@ -412,7 +412,7 @@ static_library("common") {
} }
if (is_mac) { if (is_mac) {
libs += [ frameworks = [
"Accelerate.framework", "Accelerate.framework",
"Carbon.framework", "Carbon.framework",
] ]
......
...@@ -551,7 +551,7 @@ jumbo_component("base") { ...@@ -551,7 +551,7 @@ jumbo_component("base") {
if (is_mac) { if (is_mac) {
deps += [ "//third_party/mozilla" ] deps += [ "//third_party/mozilla" ]
libs += [ frameworks = [
"Accelerate.framework", "Accelerate.framework",
"AppKit.framework", "AppKit.framework",
"QuartzCore.framework", "QuartzCore.framework",
......
...@@ -50,12 +50,12 @@ jumbo_component("clipboard_types") { ...@@ -50,12 +50,12 @@ jumbo_component("clipboard_types") {
deps = [ "//base" ] deps = [ "//base" ]
libs = [] frameworks = []
if (is_mac || is_ios) { if (is_mac || is_ios) {
libs += [ "Foundation.framework" ] frameworks += [ "Foundation.framework" ]
} }
if (is_mac) { if (is_mac) {
libs += [ "AppKit.framework" ] frameworks += [ "AppKit.framework" ]
} }
} }
......
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