Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make is_starboard a global variable #4774

Merged
merged 2 commits into from
Jan 28, 2025
Merged

Make is_starboard a global variable #4774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f075894
Make is_starboard a global variable
niranjanyardi Jan 28, 2025
88b0e90
Cleanup
niranjanyardi Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/config/ozone_extra.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ozone_external_platform_ui_test_support_deps = []
# interactive_ui_tests.
ozone_external_interactive_ui_tests_deps = []

if (defined(is_starboard) && is_starboard) {
if (is_starboard) {
ozone_external_platforms += ["starboard"]
ozone_external_platform_deps += ["platform/starboard"]
ozone_external_platform_test_deps += ["platform/starboard:starboard_unittests"]
Expand Down
4 changes: 4 additions & 0 deletions cobalt/build/configs/cobalt.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ declare_args() {
is_cobalt = false
cobalt_is_release_build = false
}

declare_args() {
is_starboard = is_cobalt && target_os != "android"
}
2 changes: 0 additions & 2 deletions cobalt/build/configs/initialize_variables.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ declare_args() {

build_type = "devel"

is_starboard = target_os != "android"

# Used to guard any customizations to Chromium or third-party code for builds
# where the Starboard porting layer is not used.
is_native_target_build = false
Expand Down
2 changes: 1 addition & 1 deletion mojo/core/test/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ source_set("run_all_unittests") {
"//testing/gtest",
]

if (defined(is_starboard) && is_starboard) {
if (is_starboard) {
# Replace the standard runner with the starboard test runner.
sources -= [ "run_all_unittests.cc" ]
sources += [ "//starboard/testing/run_all_unittests_starboard.cc" ]
Expand Down
1 change: 0 additions & 1 deletion starboard/android/arm/toolchain/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ gcc_toolchain("native_target") {
nm = "nm"

toolchain_args = {
is_starboard = false
is_native_target_build = true
is_clang = true
}
Expand Down
1 change: 0 additions & 1 deletion starboard/android/arm64/toolchain/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ gcc_toolchain("native_target") {
nm = "nm"

toolchain_args = {
is_starboard = false
is_native_target_build = true
is_clang = true
}
Expand Down
Loading