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/+/32628Tested-by: Thomas Anderson <thomasanderson@chromium.org> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Move libvk_swiftshader.lds from sources to inputs
42d64617 · Tom Anderson · Thomas Anderson · 85035be3 · 42d64617 · 42d64617
Commit 42d64617 authored Jun 12, 2019 by Tom Anderson Committed by Thomas Anderson Jun 12, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

BUILD.gn src/OpenGL/libEGL/BUILD.gn +3 -0

BUILD.gn src/OpenGL/libGLESv2/BUILD.gn +3 -0

BUILD.gn src/Vulkan/BUILD.gn +4 -3

No files found.
--- a/src/OpenGL/libEGL/BUILD.gn
+++ b/src/OpenGL/libEGL/BUILD.gn
@@ -78,6 +78,9 @@ swiftshader_shared_library("swiftshader_libEGL") {
    if (use_x11) {
      sources += [ "../../Main/libX11.cpp" ]
    }
+    inputs = [
+      "libEGL.lds",
+    ]
    ldflags =
        [ "-Wl,--version-script=" + rebase_path("libEGL.lds", root_build_dir) ]
  }

--- a/src/OpenGL/libGLESv2/BUILD.gn
+++ b/src/OpenGL/libGLESv2/BUILD.gn
@@ -127,6 +127,9 @@ swiftshader_shared_library("swiftshader_libGLESv2") {
  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) ]
  }

--- a/src/Vulkan/BUILD.gn
+++ b/src/Vulkan/BUILD.gn
@@ -99,7 +99,6 @@ swiftshader_shared_library("swiftshader_libvulkan") {
    "VulkanPlatform.h",
    "libVulkan.cpp",
    "libvk_swiftshader.def",
-    "libvk_swiftshader.lds",
    "main.cpp",
    "resource.h",
  ]
@@ -109,8 +108,10 @@ swiftshader_shared_library("swiftshader_libvulkan") {
  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) ]
  }