Give SwiftShader libraries a unique name on Mac

It appears that some bundling operations on Mac actually require that all libraries have a unique name, since output_dir is effectively ignored and overwritten in that scenario, so I have to remove that renaming code on Mac so that SwiftShader doesn't clash with Angle. Change-Id: I3d36df525ad9229da0c35f27d367e7deef7e430d Reviewed-on: https://swiftshader-review.googlesource.com/7271Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Give SwiftShader libraries a unique name on Mac
f483671b · Alexis Hetu · Alexis Hétu · 601d0059 · f483671b · f483671b
Commit f483671b authored Sep 23, 2016 by Alexis Hetu Committed by Alexis Hétu Sep 23, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

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

BUILD.gn src/OpenGL/libGLESv2/BUILD.gn +4 -2

No files found.
--- a/src/OpenGL/libEGL/BUILD.gn
+++ b/src/OpenGL/libEGL/BUILD.gn
@@ -37,8 +37,10 @@ config("swiftshader_libEGL_private_config") {
 }
 shared_library("swiftshader_libEGL") {
-  output_name = "libEGL"
+  if (!is_mac) {
-  output_dir = "$root_out_dir/swiftshader"
+    output_name = "libEGL"
+    output_dir = "$root_out_dir/swiftshader"
+  }
  sources = [
    "Config.cpp",

--- a/src/OpenGL/libGLESv2/BUILD.gn
+++ b/src/OpenGL/libGLESv2/BUILD.gn
@@ -46,8 +46,10 @@ config("swiftshader_libGLESv2_private_config") {
 }
 shared_library("swiftshader_libGLESv2") {
-  output_name = "libGLESv2"
+  if (!is_mac) {
-  output_dir = "$root_out_dir/swiftshader"
+    output_name = "libGLESv2"
+    output_dir = "$root_out_dir/swiftshader"
+  }
  deps = [
    "../../OpenGL/compiler:swiftshader_opengl_compiler",