Explicitly filter assigments to sources variable

set_sources_assignment_filter() is considered as a mis-feature of gn (as it makes it difficult to reason about the BUILD.gn files individually). Change BUILD.gn in SwiftShader to check the platform before adding plaform-specific source files to "sources" variable. This will allow removing the global sources assignment filter from Chromium codebase. Bug: chromium:1018739 Change-Id: Icf357de347b09dccce8c031d84ae7d8ce0ec396b Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/48668Tested-by: Corentin Wallez <cwallez@google.com> Reviewed-by: Corentin Wallez <cwallez@google.com> Kokoro-Result: kokoro <noreply+kokoro@google.com>

Explicitly filter assigments to sources variable
b94db86c · Sylvain Defresne · Corentin Wallez · a0940624 · b94db86c · b94db86c
Commit b94db86c authored Sep 24, 2020 by Sylvain Defresne Committed by Corentin Wallez Sep 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 9 deletions

BUILD.gn src/OpenGL/libEGL/BUILD.gn +7 -2

BUILD.gn src/OpenGL/libGLESv2/BUILD.gn +8 -5

BUILD.gn src/Vulkan/BUILD.gn +7 -2

No files found.
--- a/src/OpenGL/libEGL/BUILD.gn
+++ b/src/OpenGL/libEGL/BUILD.gn
@@ -61,12 +61,17 @@ swiftshader_shared_library("swiftshader_libEGL") {
    "Display.cpp",
    "Surface.cpp",
    "libEGL.cpp",
-    "libEGL.def",
-    "libEGL.rc",
    "main.cpp",
    "resource.h",
  ]

+  if (is_win) {
+    sources += [
+      "libEGL.def",
+      "libEGL.rc",
+    ]
+  }
+
  if (is_mac) {
    sources += [ "OSXUtils.mm" ]
    frameworks = [

--- a/src/OpenGL/libGLESv2/BUILD.gn
+++ b/src/OpenGL/libGLESv2/BUILD.gn
@@ -118,11 +118,14 @@ swiftshader_shared_library("swiftshader_libGLESv2") {

  deps = [ ":swiftshader_libGLESv2_static" ]

-  sources = [
-    "entry_points.cpp",
-    "libGLESv2.def",
-    "libGLESv2.rc",
-  ]
+  sources = [ "entry_points.cpp" ]
+
+  if (is_win) {
+    sources += [
+      "libGLESv2.def",
+      "libGLESv2.rc",
+    ]
+  }

  if (is_mac) {
    ldflags = [

--- a/src/Vulkan/BUILD.gn
+++ b/src/Vulkan/BUILD.gn
@@ -139,11 +139,9 @@ swiftshader_shared_library("swiftshader_libvulkan") {
    "VkShaderModule.cpp",
    "VkSpecializationInfo.cpp",
    "VkStringify.cpp",
-    "Vulkan.rc",
    "libVulkan.cpp",
    "main.cpp",
    "resource.h",
-    "vk_swiftshader.def",
  ]

  configs = [ ":swiftshader_libvulkan_private_config" ]
@@ -155,6 +153,13 @@ swiftshader_shared_library("swiftshader_libvulkan") {
    output_name = "libvk_swiftshader"
  }

+  if (is_win) {
+    sources += [
+      "Vulkan.rc",
+      "vk_swiftshader.def",
+    ]
+  }
+
  if (is_mac) {
    ldflags = [
      "-Wl,-install_name,@rpath/libvk_swiftshader.dylib",