Commit 2b10184a authored by Robert Sesek's avatar Robert Sesek Committed by Commit Bot

apple: Convert GN libs lists to frameworks in //remoting.

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: Ifa946ad268b0197368d6f9694a69976eb14d752a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2276817
Auto-Submit: Robert Sesek <rsesek@chromium.org>
Commit-Queue: Lambros Lambrou <lambroslambrou@chromium.org>
Reviewed-by: default avatarLambros Lambrou <lambroslambrou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784256}
parent a9fc7879
...@@ -48,11 +48,11 @@ source_set("display") { ...@@ -48,11 +48,11 @@ source_set("display") {
} }
if (is_mac) { if (is_mac) {
libs = [ "OpenGL.framework" ] frameworks = [ "OpenGL.framework" ]
} }
if (is_ios) { if (is_ios) {
libs = [ frameworks = [
"GLKit.framework", "GLKit.framework",
"OpenGLES.framework", "OpenGLES.framework",
] ]
......
...@@ -27,7 +27,7 @@ source_set("file_transfer") { ...@@ -27,7 +27,7 @@ source_set("file_transfer") {
] ]
if (is_mac) { if (is_mac) {
libs = [ "AppKit.framework" ] frameworks = [ "AppKit.framework" ]
} }
if (!is_mac && !is_win) { if (!is_mac && !is_win) {
......
...@@ -124,7 +124,7 @@ mac_app_bundle("remoting_host_uninstaller") { ...@@ -124,7 +124,7 @@ mac_app_bundle("remoting_host_uninstaller") {
"uninstaller/remoting_uninstaller_app.mm", "uninstaller/remoting_uninstaller_app.mm",
] ]
libs = [ frameworks = [
"Cocoa.framework", "Cocoa.framework",
"CoreFoundation.framework", "CoreFoundation.framework",
"Security.framework", "Security.framework",
......
...@@ -40,7 +40,7 @@ source_set("ios_core") { ...@@ -40,7 +40,7 @@ source_set("ios_core") {
"//remoting/protocol", "//remoting/protocol",
] ]
libs = [ frameworks = [
"CoreGraphics.framework", "CoreGraphics.framework",
"GLKit.framework", "GLKit.framework",
"OpenGLES.framework", "OpenGLES.framework",
......
...@@ -96,7 +96,7 @@ source_set("common_source_set") { ...@@ -96,7 +96,7 @@ source_set("common_source_set") {
"//ui/resources", "//ui/resources",
] ]
libs = [ frameworks = [
"UIKit.framework", "UIKit.framework",
"AVFoundation.framework", "AVFoundation.framework",
"Foundation.framework", "Foundation.framework",
...@@ -131,7 +131,7 @@ source_set("app_source_set") { ...@@ -131,7 +131,7 @@ source_set("app_source_set") {
":common_source_set", ":common_source_set",
"//base", "//base",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
# TODO(crbug.com/875022) fix for OpenGLES deprecation. # TODO(crbug.com/875022) fix for OpenGLES deprecation.
defines = [ "GLES_SILENCE_DEPRECATION" ] defines = [ "GLES_SILENCE_DEPRECATION" ]
......
...@@ -88,7 +88,7 @@ template("ios_remoting_app_tmpl") { ...@@ -88,7 +88,7 @@ template("ios_remoting_app_tmpl") {
"VERSION_SHORT=$remoting_version_short", "VERSION_SHORT=$remoting_version_short",
] ]
libs = [ frameworks = [
"Accelerate.framework", "Accelerate.framework",
"AudioToolbox.framework", "AudioToolbox.framework",
"CoreAudio.framework", "CoreAudio.framework",
......
...@@ -20,7 +20,7 @@ source_set("audio") { ...@@ -20,7 +20,7 @@ source_set("audio") {
public_deps = [ "//remoting/proto" ] public_deps = [ "//remoting/proto" ]
libs = [ "AudioToolbox.framework" ] frameworks = [ "AudioToolbox.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
......
...@@ -37,7 +37,7 @@ source_set("display") { ...@@ -37,7 +37,7 @@ source_set("display") {
include_dirs = [ "//third_party/protobuf/src" ] include_dirs = [ "//third_party/protobuf/src" ]
libs = [ frameworks = [
"CoreGraphics.framework", "CoreGraphics.framework",
"GLKit.framework", "GLKit.framework",
"OpenGLES.framework", "OpenGLES.framework",
......
...@@ -36,7 +36,7 @@ source_set("facade") { ...@@ -36,7 +36,7 @@ source_set("facade") {
"//ui/base", "//ui/base",
] ]
libs = [ "CoreFoundation.framework" ] frameworks = [ "CoreFoundation.framework" ]
public_deps = [ public_deps = [
"//remoting/base", "//remoting/base",
......
...@@ -12,7 +12,7 @@ source_set("mdc") { ...@@ -12,7 +12,7 @@ source_set("mdc") {
"MDCActionImageView.m", "MDCActionImageView.m",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
deps = [ "//ios/third_party/material_components_ios" ] deps = [ "//ios/third_party/material_components_ios" ]
......
...@@ -53,7 +53,7 @@ source_set("unit_tests") { ...@@ -53,7 +53,7 @@ source_set("unit_tests") {
"//testing/gtest", "//testing/gtest",
] ]
libs = [ "Security.framework" ] frameworks = [ "Security.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -25,7 +25,7 @@ source_set("session") { ...@@ -25,7 +25,7 @@ source_set("session") {
"//remoting/protocol", "//remoting/protocol",
] ]
libs = [ "CoreGraphics.framework" ] frameworks = [ "CoreGraphics.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
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