Index: build/android/envsetup_functions.sh |
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh |
index e7ed8f27f97b2c5cb6264088cbbf83c74be72e93..b0f13b501658312119b22f2ba48e5444574ee2d8 100755 |
--- a/build/android/envsetup_functions.sh |
+++ b/build/android/envsetup_functions.sh |
@@ -92,22 +92,22 @@ common_vars_defines() { |
# and V8 mksnapshot. |
case "${TARGET_PRODUCT}" in |
"passion"|"soju"|"sojua"|"sojus"|"yakju"|"mysid"|"nakasi") |
- DEFINES+=" target_arch=arm" |
+ DEFINES+=" target_arch=arm ndk_target_arch=arm " |
DEFINES+=" arm_neon=1 armv7=1 arm_thumb=1" |
DEFINES+=" ${ORDER_DEFINES}" |
;; |
"trygon"|"tervigon") |
- DEFINES+=" target_arch=arm" |
+ DEFINES+=" target_arch=arm ndk_target_arch=arm " |
DEFINES+=" arm_neon=0 armv7=1 arm_thumb=1 arm_fpu=vfpv3-d16" |
DEFINES+=" ${ORDER_DEFINES}" |
;; |
"full") |
- DEFINES+=" target_arch=arm" |
+ DEFINES+=" target_arch=arm ndk_target_arch=arm " |
DEFINES+=" arm_neon=0 armv7=0 arm_thumb=1 arm_fpu=vfp" |
;; |
*x86*) |
# TODO(tedbo): The ia32 build fails on ffmpeg, so we disable it here. |
- DEFINES+=" target_arch=ia32 use_libffmpeg=0" |
+ DEFINES+=" target_arch=ia32 ndk_target_arch=x86 use_libffmpeg=0" |
Yaron
2012/08/22 22:51:35
I don't think you need this new variable at all. L
Peter Beverloo
2012/08/23 10:45:48
Agreed. If it turns out you do, please name it "an
michaelbai
2012/08/23 22:53:00
Done.
|
host_arch=$(uname -m | sed -e \ |
's/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/') |