| 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"
|
| }
|
|
|