Address feedback 2

youtube · Oct 9, 2024 · 3179d4f · 3179d4f
1 parent cc88044
commit 3179d4f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 23 deletions.
diff --git a/chrobalt/build/configs/initialize_variables.gni b/chrobalt/build/configs/initialize_variables.gni
@@ -27,12 +27,10 @@ declare_args() {
   # where the Starboard porting layer is not used.
   is_native_target_build = false
 
+  # TODO(b/372338329) : Investigate removing cobalt_fastbuild
   cobalt_fastbuild = getenv("IS_CI") == "1"
-
   is_internal_build = getenv("COBALT_USE_INTERNAL_BUILD") == "1"
 
-  is_docker_build = getenv("IS_DOCKER") == "1"
-
   using_old_compiler = false
 
   build_with_separate_cobalt_toolchain = true
@@ -72,7 +70,6 @@ if (is_mac) {
 # Get the path to the starboard implementation and include its GN
 # configuration.
 import("//starboard/build/platform_path.gni")
-
 if (build_with_separate_cobalt_toolchain) {
   cobalt_toolchain = "//$starboard_path/toolchain:cobalt"
   starboard_toolchain = "//$starboard_path/toolchain:starboard"
@@ -81,4 +78,4 @@ if (build_with_separate_cobalt_toolchain) {
   starboard_toolchain = cobalt_toolchain
 }
 
-set_default_toolchain(cobalt_toolchain)
+set_default_toolchain(cobalt_toolchain)
diff --git a/starboard/BUILD.gn b/starboard/BUILD.gn
@@ -68,25 +68,21 @@ group("gn_all") {
   }
 
   if (!sb_is_evergreen) {
-    if (sb_is_evergreen_compatible) {
-      if (enable_evergreen_code) {
-        deps += [
-          "//starboard/elf_loader:elf_loader_test_install($starboard_toolchain)",
-          "//starboard/loader_app:installation_manager_test_install($starboard_toolchain)",
-          "//starboard/loader_app:reset_evergreen_update_test_install($starboard_toolchain)",
+    if (sb_is_evergreen_compatible && enable_evergreen_code) {
+      deps += [
+        "//starboard/elf_loader:elf_loader_test_install($starboard_toolchain)",
+        "//starboard/loader_app:installation_manager_test_install($starboard_toolchain)",
+        "//starboard/loader_app:reset_evergreen_update_test_install($starboard_toolchain)",
+      ]
+      if (current_toolchain == starboard_toolchain) {
+        deps += [ "//third_party/lz4_lib:lz4" ]
+        deps += [ "//third_party/crashpad/crashpad/client" ]
+
+        data_deps = [
+          "//starboard/loader_app($starboard_toolchain)",
+          "//third_party/crashpad/crashpad/handler:crashpad_handler(//$starboard_path/toolchain:native_target)",
+          "//third_party/crashpad/crashpad/tools:crashpad_database_util(//$starboard_path/toolchain:native_target)",
         ]
-        if (current_toolchain == starboard_toolchain) {
-          deps += [ "//third_party/lz4_lib:lz4" ]
-          if (enable_evergreen_code) {
-            deps += [ "//third_party/crashpad/crashpad/client" ]
-
-            data_deps = [
-              "//starboard/loader_app($starboard_toolchain)",
-              "//third_party/crashpad/crashpad/handler:crashpad_handler(//$starboard_path/toolchain:native_target)",
-              "//third_party/crashpad/crashpad/tools:crashpad_database_util(//$starboard_path/toolchain:native_target)",
-            ]
-          }
-        }
       }
     }
   } else {  # !sb_is_evergreen