From 7d8e74ab61c73acb0183be0ef17e816b0b1e613e Mon Sep 17 00:00:00 2001 From: Niranjan Yardi Date: Tue, 8 Aug 2023 20:01:00 -0700 Subject: [PATCH] Set sb_is_evergreen=false for linux modular builds b/294230277 Change-Id: I00c3832e12f8bd012a34ec9b962e70e82cc85f99 --- starboard/build/config/BUILDCONFIG.gn | 4 ++-- starboard/build/config/base_configuration.gni | 5 +++-- starboard/build/config/modular/helper_variables.gni | 2 +- .../shared/platform_configuration/configuration.gni | 2 +- .../x64x11/shared/platform_configuration/configuration.gni | 3 ++- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/starboard/build/config/BUILDCONFIG.gn b/starboard/build/config/BUILDCONFIG.gn index 12b7d489f045..332ab9ef1ca6 100644 --- a/starboard/build/config/BUILDCONFIG.gn +++ b/starboard/build/config/BUILDCONFIG.gn @@ -34,7 +34,7 @@ declare_args() { using_old_compiler = false - is_modular_toolchain = false + build_with_separate_cobalt_toolchain = false } assert(!(is_starboard && is_native_target_build), @@ -98,7 +98,7 @@ if (target_cpu == "x86" || target_cpu == "arm") { } host_toolchain = "//starboard/build/toolchain/$host_os:$_host_toolchain_cpu" -if (is_modular_toolchain) { +if (build_with_separate_cobalt_toolchain) { # TODO(b/294450490): decide a way to set cobalt_toolchain for modular builds for all platforms. # we'll need more conditionals for other platforms. if (host_os == "win") { diff --git a/starboard/build/config/base_configuration.gni b/starboard/build/config/base_configuration.gni index 8e19f4c331e6..02411800daac 100644 --- a/starboard/build/config/base_configuration.gni +++ b/starboard/build/config/base_configuration.gni @@ -20,7 +20,7 @@ import("//starboard/build/config/enable_vr.gni") # All build arguments in this file must have documentation. # Please follow the formatting in this file when adding new ones. -if (is_modular_toolchain) { +if (build_with_separate_cobalt_toolchain) { default_target_type = "shared_library" } else { default_target_type = "executable" @@ -172,7 +172,8 @@ declare_args() { v8_enable_webassembly = false } -if (current_toolchain == starboard_toolchain && is_modular_toolchain) { +if (current_toolchain == starboard_toolchain && + build_with_separate_cobalt_toolchain) { declare_args() { # Target-specific configurations for executable targets. executable_configs = diff --git a/starboard/build/config/modular/helper_variables.gni b/starboard/build/config/modular/helper_variables.gni index 2f37e61164dc..b789642a6099 100644 --- a/starboard/build/config/modular/helper_variables.gni +++ b/starboard/build/config/modular/helper_variables.gni @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -sb_is_modular = sb_is_evergreen || is_modular_toolchain +sb_is_modular = sb_is_evergreen || build_with_separate_cobalt_toolchain diff --git a/starboard/evergreen/shared/platform_configuration/configuration.gni b/starboard/evergreen/shared/platform_configuration/configuration.gni index f3aab3370c76..4327e1df5cb2 100644 --- a/starboard/evergreen/shared/platform_configuration/configuration.gni +++ b/starboard/evergreen/shared/platform_configuration/configuration.gni @@ -14,7 +14,7 @@ import("//starboard/build/config/base_configuration.gni") -sb_is_evergreen = true +sb_is_evergreen = !build_with_separate_cobalt_toolchain cobalt_font_package = "empty" diff --git a/starboard/linux/x64x11/shared/platform_configuration/configuration.gni b/starboard/linux/x64x11/shared/platform_configuration/configuration.gni index 7155f4ac873b..606c86ed733d 100644 --- a/starboard/linux/x64x11/shared/platform_configuration/configuration.gni +++ b/starboard/linux/x64x11/shared/platform_configuration/configuration.gni @@ -13,7 +13,8 @@ # limitations under the License. # TODO(b/294230277): Remove evergreen configs from linux modular builds -if (current_toolchain == default_toolchain && is_modular_toolchain) { +if (current_toolchain == default_toolchain && + build_with_separate_cobalt_toolchain) { import("//starboard/evergreen/x64/platform_configuration/configuration.gni") platform_tests_path = "//starboard/linux/shared:starboard_platform_tests($starboard_toolchain)"