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: Ief11c081d55b07e61252a3c66c315ceaf79de0b7 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/46108 Kokoro-Result: kokoro <noreply+kokoro@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Nicolas Capens <nicolascapens@google.com> Presubmit-Ready: Sylvain Defresne <sdefresne@chromium.org>

Convert GN libs lists to frameworks
08a294d3 · Sylvain Defresne · 76cae97f · 08a294d3 · 08a294d3 · 08a294d3
Commit 08a294d3 authored Jul 02, 2020 by Sylvain Defresne
Showing with 5 additions and 5 deletions

BUILD.gn src/Main/BUILD.gn +1 -1

BUILD.gn src/OpenGL/libEGL/BUILD.gn +1 -1

BUILD.gn src/OpenGL/libGLESv2/BUILD.gn +1 -1

BUILD.gn src/WSI/BUILD.gn +1 -1

BUILD.gn tests/GLESUnitTests/BUILD.gn +1 -1

No files found.
--- a/src/Main/BUILD.gn
+++ b/src/Main/BUILD.gn
@@ -76,7 +76,7 @@ swiftshader_source_set("swiftshader_main") {
  if (is_mac) {
    include_dirs += [ "../../include" ]
-    libs = [
+    frameworks = [
      "Quartz.framework",
      "Cocoa.framework",
    ]

--- a/src/OpenGL/libEGL/BUILD.gn
+++ b/src/OpenGL/libEGL/BUILD.gn
@@ -67,7 +67,7 @@ swiftshader_shared_library("swiftshader_libEGL") {
  if (is_mac) {
    sources += [ "OSXUtils.mm" ]
-    libs = [
+    frameworks = [
      "Quartz.framework",
      "Cocoa.framework",
      "CoreFoundation.framework",

--- a/src/OpenGL/libGLESv2/BUILD.gn
+++ b/src/OpenGL/libGLESv2/BUILD.gn
@@ -93,7 +93,7 @@ swiftshader_static_library("swiftshader_libGLESv2_static") {
  ]
  if (is_mac) {
-    libs = [
+    frameworks = [
      "CoreFoundation.framework",
      "IOSurface.framework",
    ]

--- a/src/WSI/BUILD.gn
+++ b/src/WSI/BUILD.gn
@@ -54,7 +54,7 @@ swiftshader_source_set("WSI") {
      "MetalSurface.hpp",
      "MetalSurface.mm",
    ]
-    libs = [
+    frameworks = [
      "Cocoa.framework",
      "QuartzCore.framework",
    ]

--- a/tests/GLESUnitTests/BUILD.gn
+++ b/tests/GLESUnitTests/BUILD.gn
@@ -54,7 +54,7 @@ if (build_with_chromium) {
        "-rpath",
        "@executable_path/",
      ]
-      libs = [
+      frameworks = [
        "CoreFoundation.framework",
        "IOSurface.framework",
      ]