Commit 90a9cf96 by Hidehiko Abe Committed by Commit Bot

Expand is_linux to is_linux || is_chromeos.

Currently is_linux is set to true on Chrome OS build, but it is planned to set to false. This CL is the preparation to keep the current behavior. Bug: chromium:1110266 Test: Built locally. Tryjob. Change-Id: I4124dfb251d68a519fed3e08555d1aa5a694c77c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2404500Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
parent e99a9df2
......@@ -19,8 +19,9 @@ if (angle_has_build) {
declare_args() {
# Use the PCI lib to collect GPU information on Linux.
use_libpci = is_linux && (!is_chromecast || is_cast_desktop_build) &&
(angle_use_x11 || use_ozone) && angle_has_build
use_libpci =
(is_linux || is_chromeos) && (!is_chromecast || is_cast_desktop_build) &&
(angle_use_x11 || use_ozone) && angle_has_build
# Link in system libGL, to work with apitrace. See doc/DebuggingTips.md.
angle_link_glx = false
......@@ -100,7 +101,7 @@ config("internal_config") {
if (is_win) {
defines += [ "ANGLE_IS_WIN" ]
} else if (is_linux) {
} else if (is_linux || is_chromeos) {
defines += [ "ANGLE_IS_LINUX" ]
}
......@@ -272,7 +273,7 @@ config("angle_no_cfi_unrelated_cast") {
angle_source_set("angle_system_utils") {
sources = angle_system_utils_sources
if (is_linux) {
if (is_linux || is_chromeos) {
libs = [ "dl" ]
}
}
......@@ -384,7 +385,7 @@ angle_static_library("angle_gpu_info_util") {
libs += [ "dxgi.lib" ]
}
if (is_linux) {
if (is_linux || is_chromeos) {
sources += libangle_gpu_info_util_linux_sources
if (angle_use_x11 && angle_has_build) {
......@@ -728,7 +729,7 @@ angle_source_set("libANGLE_base") {
sources += libangle_gl_egl_dl_sources
sources += libangle_gl_egl_android_sources
}
if (is_linux) {
if (is_linux || is_chromeos) {
sources += libangle_gl_egl_sources
sources += libangle_gl_egl_dl_sources
}
......
......@@ -33,7 +33,7 @@ if (angle_has_build) {
is_asan = false
build_with_chromium = false
dcheck_always_on = false
angle_use_x11 = is_linux && !is_ggp
angle_use_x11 = (is_linux || is_chromeos) && !is_ggp
use_ozone = false
use_fuzzing_engine = false
}
......@@ -99,9 +99,9 @@ declare_args() {
angle_enable_d3d9 = is_win && !angle_is_winuwp
angle_enable_d3d11 = is_win
angle_enable_gl =
(ozone_platform_gbm || !is_linux || (angle_use_x11 && !is_chromeos)) &&
!is_fuchsia && !angle_is_winuwp && !is_ggp && !is_win_arm64
angle_enable_gl = (ozone_platform_gbm || (!is_linux && !is_chromeos) ||
(angle_use_x11 && !is_chromeos)) && !is_fuchsia &&
!angle_is_winuwp && !is_ggp && !is_win_arm64
# ANGLE Vulkan backend on Android requires API level 26, i.e. Oreo, due to
# Vulkan Validation Layers compatibility issues, see http://crrev/c/1405714.
......@@ -157,8 +157,8 @@ angle_remove_configs = []
if (angle_has_build) {
angle_remove_configs += [ "//build/config/compiler:default_include_dirs" ]
}
angle_better_stack_traces =
(is_debug || dcheck_always_on) && is_linux && !is_asan && !is_cfi
angle_better_stack_traces = (is_debug || dcheck_always_on) &&
(is_linux || is_chromeos) && !is_asan && !is_cfi
if (angle_has_build && is_clang) {
angle_remove_configs += [ "//build/config/clang:find_bad_constructs" ]
......@@ -360,7 +360,7 @@ template("angle_test") {
configs -= [ "//build/config/android:hide_all_but_jni" ]
}
if (is_linux && !is_component_build) {
if ((is_linux || is_chromeos) && !is_component_build) {
# Set rpath to find shared libs in a non-component build.
configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
}
......@@ -391,7 +391,7 @@ template("angle_test") {
"//testing/xvfb.py",
]
if (is_linux && !is_component_build) {
if ((is_linux || is_chromeos) && !is_component_build) {
# Set rpath to find shared libs in a non-component build.
configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
}
......
......@@ -74,7 +74,7 @@ angle_system_utils_sources = [
"src/common/system_utils.h",
]
if (is_linux || is_android || is_fuchsia) {
if (is_linux || is_chromeos || is_android || is_fuchsia) {
angle_system_utils_sources += [
"src/common/system_utils_linux.cpp",
"src/common/system_utils_posix.cpp",
......
......@@ -134,7 +134,7 @@ angle_test("angle_unittests") {
}
}
if (is_win || is_linux || is_mac || is_android || is_fuchsia) {
if (is_win || is_linux || is_chromeos || is_mac || is_android || is_fuchsia) {
import("angle_end2end_tests.gni")
angle_test("angle_end2end_tests") {
......@@ -191,7 +191,7 @@ if (is_win || is_linux || is_mac || is_android || is_fuchsia) {
}
}
if (is_win || is_linux || is_mac || is_android) {
if (is_win || is_linux || is_chromeos || is_mac || is_android) {
import("angle_white_box_tests.gni")
angle_test("angle_white_box_tests") {
......@@ -255,7 +255,7 @@ angle_perftests_common("angle_perftests_static") {
test_utils = ":angle_common_test_utils_static"
}
if (is_win || is_linux || is_android || is_mac) {
if (is_win || is_linux || is_chromeos || is_android || is_mac) {
import("angle_perftests.gni")
# This test suite is for perf tests that use ANGLE's internals in some direct way.
......@@ -283,7 +283,7 @@ if (is_win || is_linux || is_android || is_mac) {
}
}
if (is_win || is_linux || is_android || is_mac || is_fuchsia) {
if (is_win || is_linux || is_chromeos || is_android || is_mac || is_fuchsia) {
import("angle_perftests.gni")
if (build_angle_trace_perf_tests) {
......@@ -393,13 +393,13 @@ if (is_win || is_linux || is_android || is_mac || is_fuchsia) {
data_deps += [ "//testing:run_perf_test" ]
}
if (is_win || is_linux) {
if (is_win || is_linux || is_chromeos) {
data_deps += [ "${angle_root}/third_party/glmark2:glmark2_angle" ]
}
if (is_win && target_cpu != "arm64") {
data_deps += [ "${angle_root}/third_party/glmark2:glmark2_wgl" ]
}
if (is_linux) {
if (is_linux || is_chromeos) {
data_deps += [ "${angle_root}/third_party/glmark2:glmark2_glx" ]
}
......@@ -819,7 +819,7 @@ if (build_angle_gles1_conform_tests) {
sources += angle_gles1_conform_common_source
if (!is_win && !is_linux) {
if (!is_win && !is_linux && !is_chromeos) {
defines = [ "NULLWS" ]
}
}
......@@ -833,7 +833,7 @@ if (build_angle_gles1_conform_tests) {
if (is_win) {
sources += [ "$gles1_conform_root/conform/covegl/native_w32.c" ]
} else if (is_linux) {
} else if (is_linux || is_chromeos) {
sources += [ "$gles1_conform_root/conform/covegl/native.c" ]
} else {
sources += [ "$gles1_conform_root/conform/covegl/native_nws.c" ]
......@@ -936,7 +936,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
# Ask the system headers to expose all the regular function otherwise
# dEQP doesn't compile and produces warnings about implicitly defined
# functions.
if (is_linux) {
if (is_linux || is_chromeos) {
# This has to be GNU_SOURCE as on Linux dEQP uses syscall()
defines += [ "_GNU_SOURCE" ]
}
......@@ -1071,7 +1071,7 @@ if (build_angle_deqp_tests && !is_fuchsia) {
if (is_win) {
sources += deqp_framework_delibs_sources_win
}
if (is_linux || is_android || is_mac) {
if (is_linux || is_chromeos || is_android || is_mac) {
sources += deqp_framework_delibs_sources_unix
}
......
......@@ -111,7 +111,7 @@ source_set("glmark2_headers") {
"src/src/texture.h",
]
if (is_linux) {
if (is_linux || is_chromeos) {
sources += [ "src/src/gl-state-glx.h" ]
}
if (is_win) {
......@@ -346,7 +346,7 @@ template("glmark2_exe") {
"src/src/native-state-win32.h",
]
}
if (is_linux) {
if (is_linux || is_chromeos) {
defines += [ "GLMARK2_USE_X11" ]
sources += [
"src/src/native-state-x11.cpp",
......@@ -370,13 +370,13 @@ glmark2_exe("glmark2_angle") {
"GLMARK2_USE_EGL",
]
if (is_linux && !is_component_build) {
if ((is_linux || is_chromeos) && !is_component_build) {
# Set rpath to find shared libs in a non-component build.
public_configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
}
}
if (is_linux) {
if (is_linux || is_chromeos) {
glmark2_exe("glmark2_glx") {
sources = [
"src/src/gl-state-glx.cpp",
......
......@@ -140,7 +140,7 @@ angle_source_set("angle_util_loader") {
config("angle_util_config") {
# Force users to include "util/header.h" instead of just "header.h".
include_dirs = [ ".." ]
if (is_linux && angle_use_x11) {
if ((is_linux || is_chromeos) && angle_use_x11) {
libs = [ "X11" ]
}
}
......@@ -169,7 +169,7 @@ foreach(is_shared_library,
]
libs = []
if (is_linux) {
if (is_linux || is_chromeos) {
libs += [
"rt",
"dl",
......
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