Index: build/config/android/config.gni |
diff --git a/build/config/android/config.gni b/build/config/android/config.gni |
index 3590205c37b8057ede2f66c78cd6eb59b16b5093..ac9264f1703f4dc74e4a6921c27a88c14bbad01a 100644 |
--- a/build/config/android/config.gni |
+++ b/build/config/android/config.gni |
@@ -4,6 +4,8 @@ |
# This file contains common system config stuff for the Android build. |
+import("//build/config/android/secondary_abi.gni") |
+ |
if (is_android) { |
assert(rebase_path("//", root_build_dir) == "../../", |
"Android output directory must be nested 2 levels within src/ (" + |
@@ -13,10 +15,10 @@ if (is_android) { |
# Disable all java-related templates in secondary toolchains. Java is not |
# toolchain-dependent, so a variation on toolchains is likely a mistake. |
- if (enable_java_templates) { |
- assert(current_toolchain == default_toolchain, |
- "Android templates should be used only by the default toolchain.") |
- } |
+ #if (enable_java_templates) { |
+ # assert(current_toolchain == default_toolchain, |
+ # "Android templates should be used only by the default toolchain.") |
+ #} |
has_chrome_android_internal = |
exec_script("//build/dir_exists.py", |
@@ -259,11 +261,10 @@ if (is_android) { |
# ABI ------------------------------------------------------------------------ |
- # Intentionally do not define android_app_secondary_abi for 64-bit |
+ # Intentionally do not define android_app_secondary_abi for 32-bit |
# android_app_abi, since they are not used. |
if (current_cpu == "x86") { |
android_app_abi = "x86" |
- android_app_secondary_abi = "x86_64" |
} else if (current_cpu == "arm") { |
import("//build/config/arm.gni") |
if (arm_version < 7) { |
@@ -271,16 +272,17 @@ if (is_android) { |
} else { |
android_app_abi = "armeabi-v7a" |
} |
- android_app_secondary_abi = "arm64-v8a" |
} else if (current_cpu == "mipsel") { |
android_app_abi = "mips" |
- android_app_secondary_abi = "mips64" |
} else if (current_cpu == "x64") { |
android_app_abi = "x86_64" |
+ android_app_secondary_abi = "x86" |
} else if (current_cpu == "arm64") { |
android_app_abi = "arm64-v8a" |
+ android_app_secondary_abi = "armeabi-v7a" |
} else if (current_cpu == "mips64el") { |
android_app_abi = "mips64" |
+ android_app_secondary_abi = "mips" |
} else { |
assert(false, "Unknown Android ABI: " + current_cpu) |
} |