Merge branch 'main' into h5vcc_system_review

youtube · Jan 28, 2025 · 520fa61 · 520fa61
2 parents 3e7108b + f892997
commit 520fa61
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/build/config/ozone_extra.gni b/build/config/ozone_extra.gni
@@ -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"]

diff --git a/cobalt/build/configs/cobalt.gni b/cobalt/build/configs/cobalt.gni
@@ -17,3 +17,7 @@ declare_args() {
   is_cobalt = false
   cobalt_is_release_build = false
 }
+
+declare_args() {
+  is_starboard = is_cobalt && target_os != "android"
+}
diff --git a/cobalt/build/configs/initialize_variables.gni b/cobalt/build/configs/initialize_variables.gni
@@ -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

diff --git a/mojo/core/test/BUILD.gn b/mojo/core/test/BUILD.gn
@@ -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" ]

diff --git a/starboard/android/arm/toolchain/BUILD.gn b/starboard/android/arm/toolchain/BUILD.gn
@@ -38,7 +38,6 @@ gcc_toolchain("native_target") {
   nm = "nm"
 
   toolchain_args = {
-    is_starboard = false
     is_native_target_build = true
     is_clang = true
   }

diff --git a/starboard/android/arm64/toolchain/BUILD.gn b/starboard/android/arm64/toolchain/BUILD.gn
@@ -40,7 +40,6 @@ gcc_toolchain("native_target") {
   nm = "nm"
 
   toolchain_args = {
-    is_starboard = false
     is_native_target_build = true
     is_clang = true
   }

diff --git a/ui/ozone/platform/starboard/test/surface_factory_starboard_unittest.cc b/ui/ozone/platform/starboard/test/surface_factory_starboard_unittest.cc
@@ -56,11 +56,11 @@ INSTANTIATE_TEST_SUITE_P(
     ImplementationTypes,
     SurfaceFactoryStarboardSupportTest,
     testing::Values(std::make_tuple(gl::kGLImplementationNone, false),
-                    std::make_tuple(gl::kGLImplementationEGLGLES2, true),
+                    std::make_tuple(gl::kGLImplementationEGLGLES2, false),
                     std::make_tuple(gl::kGLImplementationMockGL, false),
                     std::make_tuple(gl::kGLImplementationStubGL, false),
                     std::make_tuple(gl::kGLImplementationDisabled, false),
-                    std::make_tuple(gl::kGLImplementationEGLANGLE, false)),
+                    std::make_tuple(gl::kGLImplementationEGLANGLE, true)),
     [](const testing::TestParamInfo<
         SurfaceFactoryStarboardSupportTest::ParamType>& info) {
       return kGLImplementationToString.at(testing::get<0>(info.param));