Rename libraries on Mac OS to prevent conflicts. ANGLE and SwiftShader produce libraries with the same name, which causes conflicts for Chrome on Mac OS when creating unstripped libraries and dSYM debug information. Renaming them temporarily works around the build tools issue. Bug chromium:735920 Change-Id: Icb4f484970ec75b8c5e7e784ce37e05ee4fbc7db Reviewed-on: https://swiftshader-review.googlesource.com/10288 Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libEGL/BUILD.gn b/src/OpenGL/libEGL/BUILD.gn index e6f76b7..0ce3a8f 100644 --- a/src/OpenGL/libEGL/BUILD.gn +++ b/src/OpenGL/libEGL/BUILD.gn
@@ -41,8 +41,10 @@ } shared_library("swiftshader_libEGL") { - output_name = "libEGL" - output_dir = "$root_out_dir/swiftshader" + if (!is_mac) { + output_name = "libEGL" + output_dir = "$root_out_dir/swiftshader" + } deps = [ "//build/config:exe_and_shlib_deps", @@ -70,7 +72,7 @@ "Quartz.framework", "Cocoa.framework", ] - ldflags = [ "-Wl,-install_name,@loader_path/swiftshader/libEGL.dylib" ] + ldflags = [ "-Wl,-install_name,@rpath/libswiftshader_libEGL.dylib" ] } else if (is_win) { configs -= [ "//build/config/win:unicode" ] ldflags = [ "/DEF:" + rebase_path("libGLESv2.def", root_build_dir) ]