--- gn/standalone/android.gni.orig 2026-08-03 07:54:19 UTC +++ gn/standalone/android.gni @@ -44,7 +44,12 @@ declare_args() { android_abi_target = "aarch64-linux-android" android_llvm_arch = "aarch64" } else { - assert(false, "Need android libgcc support for this arch.") + # This file is imported unconditionally (for android_api_level), so a CPU + # that Android does not target must not break non-Android builds. These + # values are unused unless is_android. + assert(!is_android, "Need android libgcc support for this arch.") + android_abi_target = "" + android_llvm_arch = "" } if (current_cpu == "x86") { @@ -56,6 +61,7 @@ declare_args() { } else if (current_cpu == "arm64") { android_app_abi = "arm64-v8a" } else { - assert(false, "Unknown ABI: " + current_cpu) + assert(!is_android, "Unknown ABI: " + current_cpu) + android_app_abi = "" } }