Commit fe878ded by Hidehiko Abe

Expand is_linux to is_linux || is_chromeos.

Currently is_linux GN variable is set to true on Chrome OS build, but is is planned to set false. This is the preparation to keep the compatibility. Bug: chromium:1110266 Test: Built locally. Change-Id: I87e8f1312c85f85a3f882698f1dce3d65e0cfab6 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/48348 Kokoro-Result: kokoro <noreply+kokoro@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarHidehiko Abe <hidehiko@google.com>
parent b33e0b36
...@@ -134,7 +134,7 @@ config("swiftshader_config") { ...@@ -134,7 +134,7 @@ config("swiftshader_config") {
] ]
} }
if (is_linux) { if (is_linux || is_chromeos) {
ldflags = [ "-Wl,--gc-sections" ] ldflags = [ "-Wl,--gc-sections" ]
if (current_cpu == "mipsel") { if (current_cpu == "mipsel") {
......
...@@ -76,7 +76,7 @@ swiftshader_source_set("swiftshader_opengl_compiler") { ...@@ -76,7 +76,7 @@ swiftshader_source_set("swiftshader_opengl_compiler") {
all_dependent_configs = [ ":swiftshader_translator_disable_pool_alloc" ] all_dependent_configs = [ ":swiftshader_translator_disable_pool_alloc" ]
} }
if (is_linux || is_mac || is_fuchsia) { if (is_linux || is_chromeos || is_mac || is_fuchsia) {
sources += [ "ossource_posix.cpp" ] sources += [ "ossource_posix.cpp" ]
} else if (is_win) { } else if (is_win) {
sources += [ "ossource_win.cpp" ] sources += [ "ossource_win.cpp" ]
......
...@@ -80,7 +80,7 @@ swiftshader_shared_library("swiftshader_libEGL") { ...@@ -80,7 +80,7 @@ swiftshader_shared_library("swiftshader_libEGL") {
"-Wl,-exported_symbols_list," + "-Wl,-exported_symbols_list," +
rebase_path("libEGL.exports", root_build_dir), rebase_path("libEGL.exports", root_build_dir),
] ]
} else if (is_linux) { } else if (is_linux || is_chromeos) {
if (use_x11) { if (use_x11) {
sources += [ "../../Main/libX11.cpp" ] sources += [ "../../Main/libX11.cpp" ]
} }
......
...@@ -130,7 +130,7 @@ swiftshader_shared_library("swiftshader_libGLESv2") { ...@@ -130,7 +130,7 @@ swiftshader_shared_library("swiftshader_libGLESv2") {
"-Wl,-exported_symbols_list," + "-Wl,-exported_symbols_list," +
rebase_path("libGLESv2.exports", root_build_dir), rebase_path("libGLESv2.exports", root_build_dir),
] ]
} else if (is_linux) { } else if (is_linux || is_chromeos) {
inputs = [ "libGLESv2.lds" ] inputs = [ "libGLESv2.lds" ]
ldflags = [ "-Wl,--version-script=" + ldflags = [ "-Wl,--version-script=" +
rebase_path("libGLESv2.lds", root_build_dir) ] rebase_path("libGLESv2.lds", root_build_dir) ]
......
...@@ -19,7 +19,7 @@ declare_args() { ...@@ -19,7 +19,7 @@ declare_args() {
# PPC64. # PPC64.
use_swiftshader_with_subzero = use_swiftshader_with_subzero =
current_cpu != "arm64" && current_cpu != "mips64el" && current_cpu != "ppc64" current_cpu != "arm64" && current_cpu != "mips64el" && current_cpu != "ppc64"
supports_llvm = is_linux || is_fuchsia || is_win || is_android || is_mac supports_llvm = is_linux || is_chromeos || is_fuchsia || is_win || is_android || is_mac
} }
config("swiftshader_reactor_private_config") { config("swiftshader_reactor_private_config") {
...@@ -102,7 +102,7 @@ if (use_swiftshader_with_subzero) { ...@@ -102,7 +102,7 @@ if (use_swiftshader_with_subzero) {
if (is_win) { if (is_win) {
include_dirs += include_dirs +=
[ "../../third_party/llvm-subzero/build/Windows/include/" ] [ "../../third_party/llvm-subzero/build/Windows/include/" ]
} else if (is_linux) { } else if (is_linux || is_chromeos) {
include_dirs += [ "../../third_party/llvm-subzero/build/Linux/include/" ] include_dirs += [ "../../third_party/llvm-subzero/build/Linux/include/" ]
} else if (is_fuchsia) { } else if (is_fuchsia) {
include_dirs += include_dirs +=
...@@ -143,7 +143,7 @@ if (use_swiftshader_with_subzero) { ...@@ -143,7 +143,7 @@ if (use_swiftshader_with_subzero) {
cflags += [ "-Wno-sign-compare" ] cflags += [ "-Wno-sign-compare" ]
} }
} }
} else if (is_linux || is_mac || is_fuchsia) { } else if (is_linux || is_chromeos || is_mac || is_fuchsia) {
cflags += [ "-Wno-macro-redefined" ] cflags += [ "-Wno-macro-redefined" ]
} }
...@@ -339,7 +339,7 @@ if (supports_llvm) { ...@@ -339,7 +339,7 @@ if (supports_llvm) {
"$llvm_dir/configs/common/include/", "$llvm_dir/configs/common/include/",
] ]
if (is_linux) { if (is_linux || is_chromeos) {
include_dirs += [ "$llvm_dir/configs/linux/include/" ] include_dirs += [ "$llvm_dir/configs/linux/include/" ]
} else if (is_fuchsia) { } else if (is_fuchsia) {
include_dirs += [ "$llvm_dir/configs/fuchsia/include/" ] include_dirs += [ "$llvm_dir/configs/fuchsia/include/" ]
......
...@@ -28,7 +28,7 @@ swiftshader_source_set("System_headers") { ...@@ -28,7 +28,7 @@ swiftshader_source_set("System_headers") {
"Socket.hpp", "Socket.hpp",
"Timer.hpp", "Timer.hpp",
] ]
if (is_linux || is_android) { if (is_linux || is_chromeos || is_android) {
sources += [ sources += [
"Linux/MemFd.hpp", "Linux/MemFd.hpp",
] ]
...@@ -46,7 +46,7 @@ swiftshader_source_set("System") { ...@@ -46,7 +46,7 @@ swiftshader_source_set("System") {
"Memory.cpp", "Memory.cpp",
"Timer.cpp", "Timer.cpp",
] ]
if (is_linux || is_android) { if (is_linux || is_chromeos || is_android) {
sources += [ sources += [
"Linux/MemFd.cpp", "Linux/MemFd.cpp",
] ]
......
...@@ -18,7 +18,7 @@ import("vulkan.gni") ...@@ -18,7 +18,7 @@ import("vulkan.gni")
# Need a separate config to ensure the warnings are added to the end. # Need a separate config to ensure the warnings are added to the end.
config("swiftshader_libvulkan_private_config") { config("swiftshader_libvulkan_private_config") {
if (is_linux) { if (is_linux || is_chromeos) {
defines = [ defines = [
"VK_USE_PLATFORM_XLIB_KHR", "VK_USE_PLATFORM_XLIB_KHR",
"VK_USE_PLATFORM_XCB_KHR", "VK_USE_PLATFORM_XCB_KHR",
...@@ -96,7 +96,7 @@ swiftshader_source_set("swiftshader_libvulkan_headers") { ...@@ -96,7 +96,7 @@ swiftshader_source_set("swiftshader_libvulkan_headers") {
"VkStringify.hpp", "VkStringify.hpp",
"VulkanPlatform.hpp", "VulkanPlatform.hpp",
] ]
if (is_linux || is_android) { if (is_linux || is_chromeos || is_android) {
sources += [ sources += [
"VkDeviceMemoryExternalLinux.hpp", "VkDeviceMemoryExternalLinux.hpp",
"VkSemaphoreExternalLinux.hpp", "VkSemaphoreExternalLinux.hpp",
...@@ -161,7 +161,7 @@ swiftshader_shared_library("swiftshader_libvulkan") { ...@@ -161,7 +161,7 @@ swiftshader_shared_library("swiftshader_libvulkan") {
"-Wl,-exported_symbols_list," + "-Wl,-exported_symbols_list," +
rebase_path("vk_swiftshader.exports", root_build_dir), rebase_path("vk_swiftshader.exports", root_build_dir),
] ]
} else if (is_linux || is_fuchsia) { } else if (is_linux || is_chromeos || is_fuchsia) {
inputs = [ inputs = [
"vk_swiftshader.lds", "vk_swiftshader.lds",
] ]
......
...@@ -31,7 +31,7 @@ swiftshader_source_set("WSI") { ...@@ -31,7 +31,7 @@ swiftshader_source_set("WSI") {
"VkSwapchainKHR.hpp", "VkSwapchainKHR.hpp",
] ]
if (is_linux) { if (is_linux || is_chromeos) {
sources += [ sources += [
"XcbSurfaceKHR.cpp", "XcbSurfaceKHR.cpp",
"XcbSurfaceKHR.hpp", "XcbSurfaceKHR.hpp",
......
...@@ -98,7 +98,7 @@ llvm_include_dirs = [ ...@@ -98,7 +98,7 @@ llvm_include_dirs = [
"configs/common/lib/Transforms/InstCombine/", "configs/common/lib/Transforms/InstCombine/",
] ]
if (is_linux) { if (is_linux || is_chromeos) {
llvm_include_dirs += [ "configs/linux/include/" ] llvm_include_dirs += [ "configs/linux/include/" ]
} else if (is_fuchsia) { } else if (is_fuchsia) {
llvm_include_dirs += [ "configs/fuchsia/include/" ] llvm_include_dirs += [ "configs/fuchsia/include/" ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment