Commit bc972c3d authored by Thomas Guillem's avatar Thomas Guillem

build: add shortcuts for armeabi-v7a and arm64-v8a" builds

Yes, armeabi-v7a is too long to type
parent 22f2aa7e
...@@ -50,8 +50,8 @@ fi ...@@ -50,8 +50,8 @@ fi
if [ -z "$ANDROID_ABI" ]; then if [ -z "$ANDROID_ABI" ]; then
echo "Please pass the ANDROID ABI to the correct architecture, using echo "Please pass the ANDROID ABI to the correct architecture, using
compile-libvlc.sh -a ARCH compile-libvlc.sh -a ARCH
ARM: armeabi-v7a ARM: (armeabi-v7a|arm)
ARM64: arm64-v8a ARM64: (arm64-v8a|arm64)
X86: x86, x86_64 X86: x86, x86_64
MIPS: mips, mips64." MIPS: mips, mips64."
exit 1 exit 1
...@@ -230,6 +230,11 @@ VLC_MODULE_BLACKLIST=" ...@@ -230,6 +230,11 @@ VLC_MODULE_BLACKLIST="
######### #########
# FLAGS # # FLAGS #
######### #########
if [ "${ANDROID_ABI}" = "arm" ] ; then
ANDROID_ABI="armeabi-v7a"
elif [ "${ANDROID_ABI}" = "arm64" ] ; then
ANDROID_ABI="arm64-v8a"
fi
# Set up ABI variables # Set up ABI variables
if [ "${ANDROID_ABI}" = "x86" ] ; then if [ "${ANDROID_ABI}" = "x86" ] ; then
......
...@@ -26,8 +26,8 @@ while [ $# -gt 0 ]; do ...@@ -26,8 +26,8 @@ while [ $# -gt 0 ]; do
case $1 in case $1 in
help|--help|-h) help|--help|-h)
echo "Use -a to set the ARCH:" echo "Use -a to set the ARCH:"
echo " ARM: armeabi-v7a" echo " ARM: (armeabi-v7a|arm)"
echo " ARM64: arm64-v8a" echo " ARM64: (arm64-v8a|arm64)"
echo " X86: x86, x86_64" echo " X86: x86, x86_64"
echo " MIPS: mips, mips64." echo " MIPS: mips, mips64."
echo "Use --release to build in release mode" echo "Use --release to build in release mode"
...@@ -83,9 +83,9 @@ if [ -z "$ANDROID_ABI" ]; then ...@@ -83,9 +83,9 @@ if [ -z "$ANDROID_ABI" ]; then
ANDROID_ABI="armeabi-v7a" ANDROID_ABI="armeabi-v7a"
fi fi
if [ "$ANDROID_ABI" = "armeabi-v7a" ]; then if [ "$ANDROID_ABI" = "armeabi-v7a" -o "$ANDROID_ABI" = "arm" ]; then
GRADLE_ABI="ARMv7" GRADLE_ABI="ARMv7"
elif [ "$ANDROID_ABI" = "arm64-v8a" ]; then elif [ "$ANDROID_ABI" = "arm64-v8a" -o "$ANDROID_ABI" = "arm64" ]; then
GRADLE_ABI="ARMv8" GRADLE_ABI="ARMv8"
elif [ "$ANDROID_ABI" = "x86" ]; then elif [ "$ANDROID_ABI" = "x86" ]; then
GRADLE_ABI="x86" GRADLE_ABI="x86"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment