From feb328cec78b151826dae100132ffa4b0200731a Mon Sep 17 00:00:00 2001
From: Niranjan Yardi <nyardi@google.com>
Date: Wed, 13 Nov 2024 14:20:35 -0800
Subject: [PATCH] Set is_cobalt = false by default

---
 .gn                                                 | 4 ++--
 cobalt/build/configs/android-arm/args.gn            | 2 ++
 cobalt/build/configs/android-arm64/args.gn          | 2 ++
 cobalt/build/configs/android-x86/args.gn            | 2 ++
 cobalt/build/configs/chromium_android-arm/args.gn   | 1 -
 cobalt/build/configs/chromium_android-arm64/args.gn | 1 -
 cobalt/build/configs/chromium_android-x86/args.gn   | 1 -
 cobalt/build/configs/chromium_linux-x64x11/args.gn  | 1 -
 cobalt/build/configs/cobalt.gni                     | 2 +-
 cobalt/build/configs/linux-x64x11/args.gn           | 1 +
 10 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gn b/.gn
index 246289e0ebb9..46edc4fc4347 100644
--- a/.gn
+++ b/.gn
@@ -167,11 +167,11 @@ exec_script_whitelist =
       "//tools/gritsettings/BUILD.gn",
     ]
 
+# TODO(b/378960295): Convert python scripts to GN actions.
 import("//cobalt/build/configs/cobalt.gni")
-if (is_cobalt) {
   exec_script_whitelist += [
     "//starboard/tools/BUILD.gn",
     "//starboard/build/config/sabi/BUILD.gn",
     "//starboard/build/platform_path.gni",
   ]
-}
\ No newline at end of file
+
diff --git a/cobalt/build/configs/android-arm/args.gn b/cobalt/build/configs/android-arm/args.gn
index d7a1f337a1fe..4d6297e5d306 100644
--- a/cobalt/build/configs/android-arm/args.gn
+++ b/cobalt/build/configs/android-arm/args.gn
@@ -1,3 +1,5 @@
 target_os = "android"
 target_cpu = "arm"
+is_cobalt = true
+
 treat_warnings_as_errors = false
diff --git a/cobalt/build/configs/android-arm64/args.gn b/cobalt/build/configs/android-arm64/args.gn
index f9f55603a8c3..18b82999d0e9 100644
--- a/cobalt/build/configs/android-arm64/args.gn
+++ b/cobalt/build/configs/android-arm64/args.gn
@@ -1,3 +1,5 @@
 target_os = "android"
 target_cpu = "arm64"
+is_cobalt = true
+
 treat_warnings_as_errors = false
diff --git a/cobalt/build/configs/android-x86/args.gn b/cobalt/build/configs/android-x86/args.gn
index db7494fc8002..2bdac9b193bd 100644
--- a/cobalt/build/configs/android-x86/args.gn
+++ b/cobalt/build/configs/android-x86/args.gn
@@ -1,3 +1,5 @@
 target_os = "android"
 target_cpu = "x86"
+is_cobalt = true
+
 treat_warnings_as_errors = false
diff --git a/cobalt/build/configs/chromium_android-arm/args.gn b/cobalt/build/configs/chromium_android-arm/args.gn
index 5c82d08c32ce..b850dd00a035 100644
--- a/cobalt/build/configs/chromium_android-arm/args.gn
+++ b/cobalt/build/configs/chromium_android-arm/args.gn
@@ -1,3 +1,2 @@
 target_os = "android"
 target_cpu = "arm"
-is_cobalt = false
diff --git a/cobalt/build/configs/chromium_android-arm64/args.gn b/cobalt/build/configs/chromium_android-arm64/args.gn
index ba0dc0650b5c..bf5f6094c599 100644
--- a/cobalt/build/configs/chromium_android-arm64/args.gn
+++ b/cobalt/build/configs/chromium_android-arm64/args.gn
@@ -1,3 +1,2 @@
 target_os = "android"
 target_cpu = "arm64"
-is_cobalt = false
diff --git a/cobalt/build/configs/chromium_android-x86/args.gn b/cobalt/build/configs/chromium_android-x86/args.gn
index 6c790e6f014a..c47c5bee4173 100644
--- a/cobalt/build/configs/chromium_android-x86/args.gn
+++ b/cobalt/build/configs/chromium_android-x86/args.gn
@@ -1,3 +1,2 @@
 target_os = "android"
 target_cpu = "x86"
-is_cobalt = false
diff --git a/cobalt/build/configs/chromium_linux-x64x11/args.gn b/cobalt/build/configs/chromium_linux-x64x11/args.gn
index 99041a6991fb..2ea8ecb4cc3d 100644
--- a/cobalt/build/configs/chromium_linux-x64x11/args.gn
+++ b/cobalt/build/configs/chromium_linux-x64x11/args.gn
@@ -1,6 +1,5 @@
 target_os = "linux"
 target_cpu = "x64"
-is_cobalt = false
 
 # TODO(b/376141256): Decide if this flag is needed here or in .gclient file
 chrome_pgo_phase = 0
diff --git a/cobalt/build/configs/cobalt.gni b/cobalt/build/configs/cobalt.gni
index cebe72fd34c4..125c08fef689 100644
--- a/cobalt/build/configs/cobalt.gni
+++ b/cobalt/build/configs/cobalt.gni
@@ -16,5 +16,5 @@
 # configuration.
 
 declare_args() {
-  is_cobalt = true
+  is_cobalt = false
 }
diff --git a/cobalt/build/configs/linux-x64x11/args.gn b/cobalt/build/configs/linux-x64x11/args.gn
index 5909a57c8a28..9cda195dc950 100644
--- a/cobalt/build/configs/linux-x64x11/args.gn
+++ b/cobalt/build/configs/linux-x64x11/args.gn
@@ -1,5 +1,6 @@
 target_os = "linux"
 target_cpu = "x64"
+is_cobalt = true
 
 use_ozone = true