Fix chromium builds with is_cobalt = false (#4298)

b/374988048 Set is_cobalt = false for chromium only(non cobalt builds)
youtube · Oct 23, 2024 · a828c6e · a828c6e
1 parent 8333551
commit a828c6e
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 98 deletions.
diff --git a/build/config/clang/clang.gni b/build/config/clang/clang.gni
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/toolchain/toolchain.gni")
+import("//cobalt/build/configs/cobalt.gni")
 
 default_clang_base_path = "//third_party/llvm-build/Release+Asserts"
 

diff --git a/cobalt/build/configs/android-arm/args.gn b/cobalt/build/configs/android-arm/args.gn
@@ -1,2 +1,3 @@
 target_os = "android"
 target_cpu = "arm"
+is_cobalt = false
diff --git a/cobalt/build/configs/android-arm64/args.gn b/cobalt/build/configs/android-arm64/args.gn
@@ -1,2 +1,3 @@
 target_os = "android"
 target_cpu = "arm64"
+is_cobalt = false
diff --git a/cobalt/build/configs/android-cobalt-arm/args.gn b/cobalt/build/configs/android-cobalt-arm/args.gn
@@ -1,4 +1,2 @@
 target_os = "android"
 target_cpu = "arm"
-
-is_cobalt = true
diff --git a/cobalt/build/configs/android-cobalt-arm64/args.gn b/cobalt/build/configs/android-cobalt-arm64/args.gn
@@ -1,4 +1,2 @@
 target_os = "android"
 target_cpu = "arm64"
-
-is_cobalt = true
diff --git a/cobalt/build/configs/android-cobalt-x86/args.gn b/cobalt/build/configs/android-cobalt-x86/args.gn
@@ -1,4 +1,2 @@
 target_os = "android"
 target_cpu = "x86"
-
-is_cobalt = true
diff --git a/cobalt/build/configs/android-x86/args.gn b/cobalt/build/configs/android-x86/args.gn
@@ -1,2 +1,3 @@
 target_os = "android"
 target_cpu = "x86"
+is_cobalt = false
diff --git a/cobalt/build/configs/cobalt.gni b/cobalt/build/configs/cobalt.gni
@@ -15,4 +15,6 @@
 # Get the path to the starboard implementation and include its GN
 # configuration.
 
-is_cobalt = true
+declare_args() {
+  is_cobalt = true
+}
diff --git a/cobalt/build/configs/linux-cobalt-x64x11/args.gn b/cobalt/build/configs/linux-cobalt-x64x11/args.gn
@@ -1,8 +1,6 @@
 target_os = "linux"
 target_cpu = "x64"
 
-is_cobalt = true
-
 enable_nacl = false
 use_dawn = false
 skia_use_dawn = false

diff --git a/cobalt/build/configs/linux-x64/args.gn b/cobalt/build/configs/linux-x64/args.gn
diff --git a/cobalt/build/configs/linux-x64x11/args.gn b/cobalt/build/configs/linux-x64x11/args.gn
@@ -1,6 +1,7 @@
 target_os = "linux"
 target_cpu = "x64"
 target_platform = "linux-x64x11"
+is_cobalt = false
 
 # Chromium flag overrides needed for building libstarboard