28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
|
|
index 26fad5adf..7a614f334 100644
|
|
--- a/build/config/BUILDCONFIG.gn
|
|
+++ b/build/config/BUILDCONFIG.gn
|
|
@@ -239,7 +239,8 @@ if (host_toolchain == "") {
|
|
_default_toolchain = ""
|
|
|
|
if (target_os == "android") {
|
|
- assert(host_os == "linux", "Android builds are only supported on Linux.")
|
|
+ assert(host_os == "linux" || host_os == "mac",
|
|
+ "Android builds are only supported on Linux/macOS.")
|
|
_default_toolchain = "//build/toolchain/android:android_clang_$target_cpu"
|
|
} else if (target_os == "chromeos" || target_os == "linux") {
|
|
# See comments in build/toolchain/cros/BUILD.gn about board compiles.
|
|
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
|
|
index 427739d70..6a5ab0594 100644
|
|
--- a/build/config/android/config.gni
|
|
+++ b/build/config/android/config.gni
|
|
@@ -327,7 +327,7 @@ if (is_android || is_chromeos) {
|
|
|
|
# Defines the name the Android build gives to the current host CPU
|
|
# architecture, which is different than the names GN uses.
|
|
- if (host_cpu == "x64") {
|
|
+ if (host_cpu == "x64" || host_cpu == "arm64") {
|
|
android_host_arch = "x86_64"
|
|
} else if (host_cpu == "x86") {
|
|
android_host_arch = "x86"
|