[Android] Specify ARMv7 if no ABI is set
Geoffrey Métais
git at videolan.org
Wed Feb 25 10:07:24 CET 2015
vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Feb 24 23:55:49 2015 +0100| [31d5ccb2cfe0fd6504ecca5a2cfd748368471ba4] | committer: Geoffrey Métais
Specify ARMv7 if no ABI is set
> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=31d5ccb2cfe0fd6504ecca5a2cfd748368471ba4
---
compile.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/compile.sh b/compile.sh
index 98bb2ca..b3e08db 100755
--- a/compile.sh
+++ b/compile.sh
@@ -185,8 +185,6 @@ elif [ "$ANDROID_ABI" = "armeabi" ]; then
GRADLE_ABI="ARMv6fpu"
elif [ "$ANDROID_ABI" = "armeabi-nofpu" ]; then
GRADLE_ABI="ARMv6nofpu"
-elif [ "$ANDROID_ABI" = "armeabi-v7a" ]; then
- GRADLE_ABI="ARMv7"
elif [ "$ANDROID_ABI" = "arm64-v8a" ]; then
GRADLE_ABI="ARMv8"
elif [ "$ANDROID_ABI" = "x86" ]; then
@@ -197,6 +195,8 @@ elif [ "$ANDROID_ABI" = "mips" ]; then
GRADLE_ABI="MIPS"
elif [ "$ANDROID_ABI" = "mips64" ]; then
GRADLE_ABI="MIPS64"
+else
+ GRADLE_ABI="ARMv7"
fi
TARGET="assemble${PLATFORM}${GRADLE_ABI}${BUILDTYPE}"
More information about the Android
mailing list