commit 42d6461730704cdc6730dd240b1f12c197ed8f0e
author Tom Anderson <thomasanderson@chromium.org> Wed Jun 12 11:05:21 2019 -0700
committer Thomas Anderson <thomasanderson@chromium.org> Wed Jun 12 18:20:22 2019 +0000
tree d5b497867f18c161a8233b2a2a4c3f587133d0b7
parent 85035be3e2bbce95c4ed11317e4542e6e3b73477

Move libvk_swiftshader.lds from sources to inputs

Needed to fix this build error with ToT gn:
https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket.appspot.com/8911014495686240880/+/steps/analyze/0/stdout

Gn does not know how to add a "*.lds" file in sources, and adding
"libvk_swiftshader.lds" to sources does not have any effect on the generated
ninja files.  With ToT gn, this becomes an error.  This CL changes the file to
be added to inputs, which will cause the target to get relinked when the file
changes.

BUG=chromium:964411
R=capn

Change-Id: Ib931f3ec886f06ad53cdc3b89d78e973e6b0aae3
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/32628
Tested-by: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

src/OpenGL/libEGL/BUILD.gn

diff --git a/src/OpenGL/libEGL/BUILD.gn b/src/OpenGL/libEGL/BUILD.gn
index f4c826d..993ca6a 100644
--- a/src/OpenGL/libEGL/BUILD.gn
+++ b/src/OpenGL/libEGL/BUILD.gn
@@ -78,6 +78,9 @@
     if (use_x11) {
       sources += [ "../../Main/libX11.cpp" ]
     }
+    inputs = [
+      "libEGL.lds",
+    ]
     ldflags =
         [ "-Wl,--version-script=" + rebase_path("libEGL.lds", root_build_dir) ]
   }

src/OpenGL/libGLESv2/BUILD.gn

diff --git a/src/OpenGL/libGLESv2/BUILD.gn b/src/OpenGL/libGLESv2/BUILD.gn
index 571b08a..d7037ca 100644
--- a/src/OpenGL/libGLESv2/BUILD.gn
+++ b/src/OpenGL/libGLESv2/BUILD.gn
@@ -127,6 +127,9 @@
   if (is_mac) {
     ldflags = [ "-Wl,-install_name,@rpath/libswiftshader_libGLESv2.dylib" ]
   } else if (is_linux) {
+    inputs = [
+      "libGLESv2.lds",
+    ]
     ldflags = [ "-Wl,--version-script=" +
                 rebase_path("libGLESv2.lds", root_build_dir) ]
   }

src/Vulkan/BUILD.gn

diff --git a/src/Vulkan/BUILD.gn b/src/Vulkan/BUILD.gn
index 2627f03..6aeaec8 100644
--- a/src/Vulkan/BUILD.gn
+++ b/src/Vulkan/BUILD.gn
@@ -99,7 +99,6 @@
     "VulkanPlatform.h",
     "libVulkan.cpp",
     "libvk_swiftshader.def",
-    "libvk_swiftshader.lds",
     "main.cpp",
     "resource.h",
   ]
@@ -109,8 +108,10 @@
   output_name = "libvulkan"
   output_dir = "$root_out_dir/swiftshader"
 
-  if (is_linux)
-  {
+  if (is_linux) {
+    inputs = [
+      "libvk_swiftshader.lds",
+    ]
     ldflags = [ "-Wl,--version-script=" +
                 rebase_path("libvk_swiftshader.lds", root_build_dir) ]
   }