Add TODO statements from previous PR feedback (#1925)

Adding TODO statements from feedback in #1918 b/309493306 (cherry picked from commit 5eb5f80)
youtube · Nov 7, 2023 · b16184e · b16184e
1 parent de97945
commit b16184e
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 0 deletions.
diff --git a/starboard/elf_loader/BUILD.gn b/starboard/elf_loader/BUILD.gn
@@ -88,7 +88,12 @@ if (sb_is_evergreen_compatible) {
   }
 }
 
+<<<<<<< HEAD
 if (current_toolchain == starboard_toolchain) {
+=======
+# TODO: b/309493306 - Stop building evergreen targets for all non-evergreen platforms.
+if (current_toolchain == starboard_toolchain && !is_host_win) {
+>>>>>>> 5eb5f808fa2 (Add TODO statements from previous PR feedback (#1925))
   target(starboard_level_final_executable_type, "elf_loader_sandbox") {
     data_deps = [ "//third_party/icu:icudata" ]
     if (cobalt_font_package == "empty") {
@@ -152,6 +157,7 @@ if (sb_is_evergreen_compatible) {
   }
 }
 
+<<<<<<< HEAD
 target(gtest_target_type, "elf_loader_test") {
   testonly = true
   sources = [ "//starboard/common/test_main.cc" ]
@@ -174,6 +180,17 @@ target(gtest_target_type, "elf_loader_test") {
     deps += [
       ":copy_elf_loader_testdata",
       ":elf_loader",
+=======
+# TODO: b/309493306 - Stop building evergreen targets for all non-evergreen platforms.
+if (!is_host_win) {
+  target(gtest_target_type, "elf_loader_test") {
+    testonly = true
+    sources = [ "//starboard/common/test_main.cc" ]
+    deps = [
+      "//starboard",
+      "//testing/gmock",
+      "//testing/gtest",
+>>>>>>> 5eb5f808fa2 (Add TODO statements from previous PR feedback (#1925))
     ]
 
     data_deps = [ ":copy_elf_loader_testdata" ]

diff --git a/starboard/loader_app/BUILD.gn b/starboard/loader_app/BUILD.gn
@@ -247,6 +247,7 @@ static_library("installation_manager") {
   ]
 }
 
+<<<<<<< HEAD
 target(gtest_target_type, "installation_manager_test") {
   testonly = true
   sources = [
@@ -261,6 +262,25 @@ target(gtest_target_type, "installation_manager_test") {
     "//testing/gmock",
     "//testing/gtest",
   ]
+=======
+# TODO: b/309493306 - Stop building evergreen targets for all non-evergreen platforms.
+if (!is_host_win) {
+  target(gtest_target_type, "installation_manager_test") {
+    testonly = true
+    sources = [
+      "//starboard/common/test_main.cc",
+      "installation_manager_test.cc",
+      "pending_restart_test.cc",
+    ]
+    deps = [
+      ":installation_manager",
+      ":installation_store_proto",
+      ":pending_restart",
+      "//testing/gmock",
+      "//testing/gtest",
+    ]
+  }
+>>>>>>> 5eb5f808fa2 (Add TODO statements from previous PR feedback (#1925))
 }
 
 static_library("slot_management") {
@@ -285,6 +305,7 @@ static_library("slot_management") {
   }
 }
 
+<<<<<<< HEAD
 target(gtest_target_type, "slot_management_test") {
   testonly = true
   sources = [
@@ -301,6 +322,27 @@ target(gtest_target_type, "slot_management_test") {
     "//testing/gmock",
     "//testing/gtest",
   ]
+=======
+# TODO: b/309493306 - Stop building evergreen targets for all non-evergreen platforms.
+if (!is_host_win) {
+  target(gtest_target_type, "slot_management_test") {
+    testonly = true
+    sources = [
+      "//starboard/common/test_main.cc",
+      "slot_management_test.cc",
+    ]
+    deps = [
+      ":app_key_files",
+      ":drain_file",
+      ":installation_manager",
+      ":installation_store_proto",
+      ":slot_management",
+      "//starboard/elf_loader:sabi_string",
+      "//testing/gmock",
+      "//testing/gtest",
+    ]
+  }
+>>>>>>> 5eb5f808fa2 (Add TODO statements from previous PR feedback (#1925))
 }
 
 static_library("pending_restart") {
@@ -332,6 +374,7 @@ static_library("reset_evergreen_update") {
   deps = [ "//starboard" ]
 }
 
+<<<<<<< HEAD
 target(gtest_target_type, "reset_evergreen_update_test") {
   testonly = true
   sources = [
@@ -343,4 +386,20 @@ target(gtest_target_type, "reset_evergreen_update_test") {
     "//testing/gmock",
     "//testing/gtest",
   ]
+=======
+# TODO: b/309493306 - Stop building evergreen targets for all non-evergreen platforms.
+if (!is_host_win) {
+  target(gtest_target_type, "reset_evergreen_update_test") {
+    testonly = true
+    sources = [
+      "//starboard/common/test_main.cc",
+      "reset_evergreen_update_test.cc",
+    ]
+    deps = [
+      ":reset_evergreen_update",
+      "//testing/gmock",
+      "//testing/gtest",
+    ]
+  }
+>>>>>>> 5eb5f808fa2 (Add TODO statements from previous PR feedback (#1925))
 }