Set is_cobalt = false by default

youtube · Nov 13, 2024 · 8c11c72 · 8c11c72
1 parent b627190
commit 8c11c72
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 7 deletions.
diff --git a/.gn b/.gn
@@ -167,11 +167,10 @@ 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",
   ]
-}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,6 @@
 target_os = "linux"
 target_cpu = "x64"
+is_cobalt = true
 
 use_ozone = true