commit 08a294d37693b7990f73bce24bc2bbc7bba32c4a
author Sylvain Defresne <sdefresne@chromium.org> Thu Jul 02 18:00:52 2020 +0200
committer Sylvain Defresne <sdefresne@chromium.org> Thu Jul 09 10:41:27 2020 +0000
tree 7a4e44bb793f9f0fd2826c6cd020ad0855fa57d3
parent 76cae97fc14cc95fb446335e2f70501f4ecc066c

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>

src/Main/BUILD.gn

diff --git a/src/Main/BUILD.gn b/src/Main/BUILD.gn
index 5e50ee8..22da32f 100644
--- a/src/Main/BUILD.gn
+++ b/src/Main/BUILD.gn
@@ -76,7 +76,7 @@
 
   if (is_mac) {
     include_dirs += [ "../../include" ]
-    libs = [
+    frameworks = [
       "Quartz.framework",
       "Cocoa.framework",
     ]

src/OpenGL/libEGL/BUILD.gn

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

src/OpenGL/libGLESv2/BUILD.gn

diff --git a/src/OpenGL/libGLESv2/BUILD.gn b/src/OpenGL/libGLESv2/BUILD.gn
index 6fa7dff..aa2c86c 100644
--- a/src/OpenGL/libGLESv2/BUILD.gn
+++ b/src/OpenGL/libGLESv2/BUILD.gn
@@ -93,7 +93,7 @@
   ]
 
   if (is_mac) {
-    libs = [
+    frameworks = [
       "CoreFoundation.framework",
       "IOSurface.framework",
     ]

src/WSI/BUILD.gn

diff --git a/src/WSI/BUILD.gn b/src/WSI/BUILD.gn
index bc08bd0..b544fef 100644
--- a/src/WSI/BUILD.gn
+++ b/src/WSI/BUILD.gn
@@ -54,7 +54,7 @@
       "MetalSurface.hpp",
       "MetalSurface.mm",
     ]
-    libs = [
+    frameworks = [
       "Cocoa.framework",
       "QuartzCore.framework",
     ]

tests/GLESUnitTests/BUILD.gn

diff --git a/tests/GLESUnitTests/BUILD.gn b/tests/GLESUnitTests/BUILD.gn
index ee67ea9..b6c9d5c 100644
--- a/tests/GLESUnitTests/BUILD.gn
+++ b/tests/GLESUnitTests/BUILD.gn
@@ -54,7 +54,7 @@
         "-rpath",
         "@executable_path/",
       ]
-      libs = [
+      frameworks = [
         "CoreFoundation.framework",
         "IOSurface.framework",
       ]