Convert GN libs lists to frameworks

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: chromium:1052560 Change-Id: I3aed298db01bdb5f6e7f37a74c1bbc06f99d760c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2279931Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

Convert GN libs lists to frameworks
bae95f81 · Sylvain Defresne · Commit Bot · cbdb76b0 · bae95f81 · bae95f81
Commit bae95f81 authored Jul 02, 2020 by Sylvain Defresne Committed by Commit Bot Jul 03, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

BUILD.gn BUILD.gn +2 -2

BUILD.gn src/libANGLE/renderer/metal/BUILD.gn +1 -1

BUILD.gn src/tests/BUILD.gn +2 -2

BUILD.gn util/BUILD.gn +1 -1

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -381,7 +381,7 @@ angle_static_library("angle_gpu_info_util") {

  if (is_mac) {
    sources += libangle_gpu_info_util_mac_sources
-    libs += [
+    frameworks = [
      "IOKit.framework",
      "CoreFoundation.framework",
      "CoreGraphics.framework",
@@ -678,7 +678,7 @@ angle_source_set("libANGLE_base") {
    }
    if (is_mac) {
      sources += libangle_gl_cgl_sources
-      libs += [
+      frameworks = [
        "Cocoa.framework",
        "IOSurface.framework",
        "OpenGL.framework",

--- a/src/libANGLE/renderer/metal/BUILD.gn
+++ b/src/libANGLE/renderer/metal/BUILD.gn
@@ -94,7 +94,7 @@ angle_source_set("angle_metal_backend") {
  cflags_objcc += objc_flags

  if (is_mac) {
-    libs += [
+    frameworks = [
      "Cocoa.framework",
      "IOSurface.framework",
      "QuartzCore.framework",

--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -53,7 +53,7 @@ angle_static_library("angle_test_expectations") {
  sources = test_expectations_sources
  if (is_mac) {
    sources += test_expectations_sources_mac
-    libs = [ "Cocoa.framework" ]
+    frameworks = [ "Cocoa.framework" ]
  }
 }

@@ -146,7 +146,7 @@ if (is_win || is_linux || is_mac || is_android || is_fuchsia) {

    if (is_mac) {
      sources += angle_end2end_tests_mac_sources
-      libs += [
+      frameworks = [
        "CoreFoundation.framework",
        "IOSurface.framework",
      ]

--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -173,7 +173,7 @@ foreach(is_shared_library,
    }

    if (is_mac) {
-      libs += [
+      frameworks = [
        "AppKit.framework",
        "QuartzCore.framework",
      ]