Remove 1 test requiring rtti

youtube · Sep 4, 2024 · 336efd2 · 336efd2
1 parent cbf9bfb
commit 336efd2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/starboard/BUILD.gn b/starboard/BUILD.gn
@@ -99,9 +99,12 @@ group("gn_all") {
 group("default") {
   deps = [
     ":starboard_group",
-    "//starboard/nplb",
     "//starboard/tools:build_app_launcher_zip",
   ]
+  # TODO(b/b/356067446): Fix building nplb for gold builds.
+  if (!is_gold) {
+    deps += [ "//starboard/nplb" ]
+  }
 }
 
 group("starboard_group") {

diff --git a/starboard/nplb/BUILD.gn b/starboard/nplb/BUILD.gn
@@ -25,8 +25,6 @@ config("cast_codec_tests") {
 target(gtest_target_type, "nplb") {
   sources = [
     "//starboard/common/test_main.cc",
-    "//starboard/common/thread.cc",
-    "//starboard/common/thread.h",
     "//starboard/nplb/sabi/alignment_test.cc",
     "//starboard/nplb/sabi/endianness_test.cc",
     "//starboard/nplb/sabi/signedness_and_size_of_enum_test.cc",
@@ -282,7 +280,6 @@ target(gtest_target_type, "nplb") {
     "thread_sampler_test.cc",
     "thread_set_name_test.cc",
     "thread_sleep_test.cc",
-    "thread_test.cc",
     "thread_yield_test.cc",
     "time_get_monotonic_now_test.cc",
     "time_get_now_test.cc",
@@ -308,6 +305,10 @@ target(gtest_target_type, "nplb") {
     sources +=
         [ "//starboard/nplb/compiler_compliance/cpp_compiler_version_check.cc" ]
   }
+  if (!is_qa && !is_gold) {
+    # TODO(b/360953120): Requires -fno-rtti to be unset and -frtti to be set to compile.
+    sources += [ "thread_test.cc" ]
+  }
 
   configs += [ "//starboard/build/config:starboard_implementation" ]
   if (sb_enable_cast_codec_tests) {