Commit 696386f2 authored by Robert Sesek's avatar Robert Sesek Committed by Commit Bot

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

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: Ib5930991d138a7f53e605e9f21bfd944a4df1129
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2276663
Commit-Queue: Colin Blundell <blundell@chromium.org>
Auto-Submit: Robert Sesek <rsesek@chromium.org>
Reviewed-by: default avatarColin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784395}
parent 0090c7dc
...@@ -61,7 +61,7 @@ if (!is_android) { ...@@ -61,7 +61,7 @@ if (!is_android) {
if (is_mac) { if (is_mac) {
sources -= [ "battery_status_manager_default.cc" ] sources -= [ "battery_status_manager_default.cc" ]
libs = [ frameworks = [
"CoreFoundation.framework", "CoreFoundation.framework",
"IOKit.framework", "IOKit.framework",
] ]
......
...@@ -84,7 +84,7 @@ source_set("generic_sensor") { ...@@ -84,7 +84,7 @@ source_set("generic_sensor") {
if (is_mac) { if (is_mac) {
deps += [ "//third_party/sudden_motion_sensor" ] deps += [ "//third_party/sudden_motion_sensor" ]
libs = [ frameworks = [
"CoreFoundation.framework", "CoreFoundation.framework",
"IOKit.framework", "IOKit.framework",
] ]
......
...@@ -116,7 +116,7 @@ source_set("geolocation") { ...@@ -116,7 +116,7 @@ source_set("geolocation") {
} }
if (is_mac) { if (is_mac) {
libs = [ frameworks = [
"CoreWLAN.framework", "CoreWLAN.framework",
"Foundation.framework", "Foundation.framework",
"CoreLocation.framework", "CoreLocation.framework",
......
...@@ -67,7 +67,7 @@ if (is_win || (is_linux && use_udev) || is_mac) { ...@@ -67,7 +67,7 @@ if (is_win || (is_linux && use_udev) || is_mac) {
} }
if (is_mac) { if (is_mac) {
libs = [ frameworks = [
"Foundation.framework", "Foundation.framework",
"IOKit.framework", "IOKit.framework",
] ]
......
...@@ -44,7 +44,7 @@ source_set("time_zone_monitor") { ...@@ -44,7 +44,7 @@ source_set("time_zone_monitor") {
} }
if (is_mac) { if (is_mac) {
libs = [ "Foundation.framework" ] frameworks = [ "Foundation.framework" ]
} }
if (is_fuchsia) { if (is_fuchsia) {
......
...@@ -51,7 +51,7 @@ source_set("power_save_blocker") { ...@@ -51,7 +51,7 @@ source_set("power_save_blocker") {
} }
} else if (is_mac) { } else if (is_mac) {
sources += [ "power_save_blocker_mac.cc" ] sources += [ "power_save_blocker_mac.cc" ]
libs = [ frameworks = [
"CoreFoundation.framework", "CoreFoundation.framework",
"IOKit.framework", "IOKit.framework",
] ]
......
...@@ -59,7 +59,7 @@ source_set("tracked") { ...@@ -59,7 +59,7 @@ source_set("tracked") {
] ]
if (is_mac) { if (is_mac) {
libs = [ "IOKit.framework" ] frameworks = [ "IOKit.framework" ]
} }
} }
......
...@@ -30,7 +30,7 @@ if (!is_ios) { ...@@ -30,7 +30,7 @@ if (!is_ios) {
"mac_init.mm", "mac_init.mm",
] ]
libs = [ "Foundation.framework" ] frameworks = [ "Foundation.framework" ]
} }
deps = [ deps = [
......
...@@ -90,7 +90,7 @@ component("sandbox") { ...@@ -90,7 +90,7 @@ component("sandbox") {
] ]
deps += [ "//sandbox/mac:seatbelt" ] deps += [ "//sandbox/mac:seatbelt" ]
public_deps += [ "mac:packaged_sb_files" ] public_deps += [ "mac:packaged_sb_files" ]
libs = [ frameworks = [
"AppKit.framework", "AppKit.framework",
"CoreFoundation.framework", "CoreFoundation.framework",
"CoreGraphics.framework", "CoreGraphics.framework",
......
...@@ -32,7 +32,7 @@ source_set("lib") { ...@@ -32,7 +32,7 @@ source_set("lib") {
"text_detection_impl_mac.h", "text_detection_impl_mac.h",
"text_detection_impl_mac.mm", "text_detection_impl_mac.mm",
] ]
libs = [ "QuartzCore.framework" ] frameworks = [ "QuartzCore.framework" ]
} else if (is_win) { } else if (is_win) {
sources += [ sources += [
"barcode_detection_provider_impl.cc", "barcode_detection_provider_impl.cc",
...@@ -122,7 +122,7 @@ source_set("tests") { ...@@ -122,7 +122,7 @@ source_set("tests") {
"text_detection_impl_win_unittest.cc", "text_detection_impl_win_unittest.cc",
] ]
if (is_mac) { if (is_mac) {
libs = [ frameworks = [
"CoreFoundation.framework", "CoreFoundation.framework",
"CoreGraphics.framework", "CoreGraphics.framework",
"QuartzCore.framework", "QuartzCore.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