Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Unified Diff: build/config/arm.gni

Issue 1934713002: Set ARM/MIPS configuration for both host and target if needed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/config/mips.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/arm.gni
diff --git a/build/config/arm.gni b/build/config/arm.gni
index fefed65cf29d8542c3cb6ea2a1fdfd175982222c..2ea36fec4351183d397571a70291f3acbdd663d9 100644
--- a/build/config/arm.gni
+++ b/build/config/arm.gni
@@ -53,7 +53,7 @@ if (target_cpu == "arm" || current_cpu == "arm") {
}
if (arm_float_abi == "") {
- if (is_android) {
+ if (current_os == "android" || target_os == "android") {
arm_float_abi = "softfp"
} else {
arm_float_abi = "hard"
@@ -74,7 +74,7 @@ if (target_cpu == "arm" || current_cpu == "arm") {
}
if (arm_float_abi == "") {
- if (is_android) {
+ if (current_os == "android" || target_os == "android") {
arm_float_abi = "softfp"
} else {
arm_float_abi = "hard"
@@ -89,7 +89,7 @@ if (target_cpu == "arm" || current_cpu == "arm") {
arm_fpu = "vfpv3-d16"
}
}
-} else if (current_cpu == "arm64") {
+} else if (current_cpu == "arm64" || target_cpu == "arm64") {
# arm64 supports only "hard".
arm_float_abi = "hard"
}
« no previous file with comments | « no previous file | build/config/mips.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698