Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index fca190c67df14a4117558832746fa2112753bda1..1bfb06f65e683d83d3ae52eaad3f789e9f71b8a4 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -1434,6 +1434,9 @@ |
'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/arch-x86', |
'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin', |
}], |
+ ['target_arch == "x64"', { |
+ 'android_app_abi%': 'x86_64', |
+ }], |
Yang Gu
2014/03/13 10:07:29
Only the abi is defined here, and the other three
Torne
2014/03/13 11:04:46
I'm not sure what you mean here.
Yang Gu
2014/03/13 16:06:07
This is the same reason as I tried to explicitly d
|
['target_arch=="arm"', { |
'conditions': [ |
['arm_version<7', { |
@@ -1458,7 +1461,7 @@ |
'android_app_abi%': '<(android_app_abi)', |
'android_gdbserver%': '<(android_gdbserver)', |
'android_ndk_root%': '<(android_ndk_root)', |
- 'android_ndk_sysroot': '<(android_ndk_sysroot)', |
+ 'android_ndk_sysroot%': '<(android_ndk_sysroot)', |
Yang Gu
2014/03/13 10:07:29
This is a typo, right?
Torne
2014/03/13 11:04:46
Yes. Everything in common.gypi should have a % so
|
'android_sdk_root%': '<(android_sdk_root)', |
'android_sdk_version%': '<(android_sdk_version)', |
'android_toolchain%': '<(android_toolchain)', |