Address andrew's feedback

base/BUILD.gn

@@ -1752,7 +1752,6 @@ component("base") {
       "allocator/partition_allocator:raw_ptr",
     ]
   }
-    print(current_toolchain, is_starboard, "current tc is_starboard val")
 
   # TODO: b/384652502 - Cobalt: Fix compiler errors building hermetically.
   if (is_cobalt && is_cobalt_hermetic_build) {
@@ -1793,7 +1792,7 @@ component("base") {
       "process/process_metrics_posix.cc",
       "sync_socket_posix.cc",
 
-      # base/posix/unix_domain_socket.cc:91:22: error: implicit conversion loses integer precision: 
+      # base/posix/unix_domain_socket.cc:91:22: error: implicit conversion loses integer precision:
       "posix/unix_domain_socket.cc",
       "posix/unix_domain_socket.h",
 
@@ -2743,7 +2742,7 @@ if (use_custom_libcxx && enable_safe_libcxx && !is_debug) {
     sources = [ "nodebug_assertion.cc" ]
     deps = [ ":base_static" ]
     if (is_starboard) {
-      deps += ["//starboard:starboard_group"]
+      deps += [ "//starboard:starboard_group" ]
     }
   }
 }

build/config/BUILDCONFIG.gn

@@ -301,6 +301,8 @@ if (is_cobalt) {
   }
 }
 
+import("//cobalt/build/configs/starboard.gni")
+
 # =============================================================================
 # OS DEFINITIONS
 # =============================================================================

build/toolchain/linux/BUILD.gn

@@ -111,7 +111,6 @@ clang_toolchain("clang_x64") {
   toolchain_args = {
     current_cpu = "x64"
     current_os = "linux"
-    is_starboard = false
   }
 }
 

cobalt/build/configs/cobalt.gni

@@ -17,7 +17,3 @@ declare_args() {
   is_cobalt = false
   cobalt_is_release_build = false
 }
-
-declare_args() {
-  is_starboard = false
-}

cobalt/build/configs/linux-x64x11/args.gn

@@ -1,7 +1,6 @@
 import("//cobalt/build/configs/chromium_linux-x64x11/args.gn")
 import("//cobalt/build/configs/common.gn")
 
-is_starboard = true
 use_ozone = true
 
 # Vulkan is a new rendering (and presentation, and more) API intended to replace

cobalt/build/configs/starboard.gni

@@ -0,0 +1,18 @@
+# Copyright 2024 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+declare_args() {
+  is_starboard = is_cobalt && target_os != "android" &&
+                 current_toolchain == default_toolchain
+}

starboard/linux/x64x11/toolchain/BUILD.gn

@@ -21,6 +21,7 @@ overridable_clang_toolchain("starboard") {
   toolchain_args = {
     current_os = "linux"
     current_cpu = "x64"
+    is_starboard = true
   }
   propagates_configs = true
 }