Remove unnecessary conditions

base/BUILD.gn

@@ -43,7 +43,7 @@ import("//build_overrides/build.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("//testing/test.gni")
 
-if (is_cobalt && is_starboard) {
+if (is_cobalt) {
   import("//cobalt/build/configs/modular_variables.gni")
 }
 

base/allocator/partition_allocator/BUILD.gn

@@ -9,6 +9,10 @@ import("//build/config/chromeos/ui_mode.gni")
 import("//build/config/dcheck_always_on.gni")
 import("//build/config/logging.gni")
 
+if (is_cobalt) {
+  import("//cobalt/build/configs/modular_variables.gni")
+}
+
 # Add partition_alloc.gni and import it for partition_alloc configs.
 
 config("partition_alloc_implementation") {
@@ -230,10 +234,7 @@ component("partition_alloc") {
 
     # TODO: b/384652502 - Cobalt: Fix compiler errors building hermetically.
     if (is_cobalt && is_starboard && current_toolchain == cobalt_toolchain) {
-      import("//cobalt/build/configs/modular_variables.gni")
-      if (use_custom_libc) {
         sources -= [ "partition_alloc_base/rand_util_posix.cc" ]
-      }
     }
 
     if (is_android || is_chromeos_ash) {
@@ -330,7 +331,6 @@ component("partition_alloc") {
   }
 
   if (is_cobalt && is_starboard && current_toolchain == cobalt_toolchain) {
-    import("//cobalt/build/configs/modular_variables.gni")
     if (use_custom_libc) {
       deps += [ "//starboard:starboard_group" ]
     }

build/config/c++/BUILD.gn

@@ -5,6 +5,10 @@ import("//build/config/compiler/compiler.gni")
 import("//build/config/dcheck_always_on.gni")
 import("//buildtools/deps_revisions.gni")
 
+if (is_cobalt) {
+  import("//cobalt/build/configs/modular_variables.gni")
+}
+
 assert(use_custom_libcxx, "should only be used if use_custom_libcxx is set")
 
 # This is included by reference in the //build/config/compiler:runtime_library
@@ -69,7 +73,6 @@ config("runtime_library") {
       "-isystem" + rebase_path("$libcxxabi_prefix/include", root_build_dir),
     ]
     if (is_cobalt && is_starboard && current_toolchain == cobalt_toolchain) {
-      import("//cobalt/build/configs/modular_variables.gni")
       if (use_custom_libc) {
         cflags_cc += [
           "-isystem" +
@@ -110,7 +113,6 @@ config("runtime_library") {
         "rt",
       ]
       if (is_cobalt && is_starboard && current_toolchain == cobalt_toolchain) {
-        import("//cobalt/build/configs/modular_variables.gni")
         if (use_custom_libc) {
           libs -= [
             "c",

buildtools/third_party/libc++/BUILD.gn

@@ -6,6 +6,10 @@ import("//build/config/c++/c++.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/toolchain.gni")
 
+if (is_cobalt) {
+  import("//cobalt/build/configs/modular_variables.gni")
+}
+
 # Used by libc++ and libc++abi.
 config("config") {
   cflags = [ "-fstrict-aliasing" ]
@@ -55,7 +59,6 @@ target(_libcxx_target_type, "libc++") {
     "//third_party/catapult/devil:devil",
   ]
   if (is_cobalt && is_starboard && current_toolchain == cobalt_toolchain) {
-    import("//cobalt/build/configs/modular_variables.gni")
     if (use_custom_libc) {
       visibility += [ "//starboard:starboard_group" ]
     }
@@ -123,7 +126,6 @@ target(_libcxx_target_type, "libc++") {
   ]
 
   if (is_cobalt && is_starboard && current_toolchain == cobalt_toolchain) {
-    import("//cobalt/build/configs/modular_variables.gni")
     if (use_custom_libc) {
       # TODO: b/384652502 - Cobalt: Fix compiler errors building hermetically.
       sources -= [ "trunk/src/atomic.cpp" ]
@@ -225,14 +227,12 @@ target(_libcxx_target_type, "libc++") {
       deps = [ "//buildtools/third_party/libc++abi" ]
     }
   }
-  if (is_cobalt) {
-    import("//cobalt/build/configs/modular_variables.gni")
-    if (is_starboard && current_toolchain == cobalt_toolchain &&
-        use_custom_libc) {
-      deps += [
-        "//third_party/llvm-project/compiler-rt:compiler_rt",
-        "//third_party/musl:c",
-      ]
-    }
+
+  if (is_cobalt && is_starboard && current_toolchain == cobalt_toolchain &&
+      use_custom_libc) {
+    deps += [
+      "//third_party/llvm-project/compiler-rt:compiler_rt",
+      "//third_party/musl:c",
+    ]
   }
 }

buildtools/third_party/libc++abi/BUILD.gn

@@ -3,6 +3,9 @@
 # found in the LICENSE file.
 
 import("//build/config/c++/c++.gni")
+if (is_cobalt) {
+  import("//cobalt/build/configs/modular_variables.gni")
+}
 
 source_set("libc++abi") {
   if (export_libcxxabi_from_executables) {
@@ -14,7 +17,6 @@ source_set("libc++abi") {
     visibility = [ "//buildtools/third_party/libc++" ]
   }
   if (is_cobalt && is_starboard && current_toolchain == cobalt_toolchain) {
-    import("//cobalt/build/configs/modular_variables.gni")
     if (use_custom_libc) {
       visibility += [ "//starboard:starboard_group" ]
     }
@@ -27,11 +29,9 @@ source_set("libc++abi") {
     deps = [ "//buildtools/third_party/libunwind" ]
   }
 
-  if (is_cobalt && is_starboard && current_toolchain == cobalt_toolchain) {
-    import("//cobalt/build/configs/modular_variables.gni")
-    if (use_custom_libc) {
-      deps = [ "//third_party/musl:c" ]
-    }
+  if (is_cobalt && is_starboard && current_toolchain == cobalt_toolchain &&
+      use_custom_libc) {
+    deps = [ "//third_party/musl:c" ]
   }
 
   sources = [

starboard/BUILD.gn

@@ -15,6 +15,7 @@
 import("//starboard/build/config/os_definitions.gni")
 import("//starboard/build/config/starboard_target_type.gni")
 import("//starboard/contrib/cast/cast.gni")
+import("//cobalt/build/configs/modular_variables.gni")
 
 if (!is_cobalt) {
   group("gn_all") {
@@ -175,7 +176,7 @@ if (!is_cobalt) {
       "//starboard/client_porting/eztime",
     ]
 
-    if (sb_is_modular && current_toolchain == cobalt_toolchain) {
+    if (sb_is_modular && use_custom_libc && current_toolchain == cobalt_toolchain) {
       public_deps += [
         "//buildtools/third_party/libc++",
         "//buildtools/third_party/libc++abi",