Unified android-{arch} into android-target

This commit is contained in:
Dave 2016-12-14 11:31:00 +01:00 committed by pancake
parent 66bce494b8
commit 669f2b55e8
8 changed files with 42 additions and 29 deletions

View File

@ -1,4 +0,0 @@
#!/bin/sh
cd `dirname $PWD/$0`
export CFLAGS="-O3"
./android-shell.sh aarch64 ./android-build.sh aarch64-static

View File

@ -1,4 +0,0 @@
#!/bin/sh
cd `dirname $PWD/$0`
export CFLAGS="-O3"
./android-shell.sh arm ./android-build.sh arm-static

View File

@ -1,5 +0,0 @@
#!/bin/sh
cd `dirname $PWD/$0`
# PIC required for mips
export CFLAGS="-O3 -fPIC"
./android-shell.sh mips ./android-build.sh mips-static

View File

@ -1,4 +0,0 @@
#!/bin/sh
cd `dirname $PWD/$0`
export CFLAGS="-O3 -fPIC -pie -fpic"
./android-shell.sh mips64 ./android-build.sh mips64-static

38
sys/android-target.sh Executable file
View File

@ -0,0 +1,38 @@
#!/bin/sh
if [ "$#" -ne 1 ]; then
echo "Please enter an android architecture..."
echo "Usage $0: {aarch64|arm|mips|mips64|x86}"
exit 1
fi
case "$1" in
aarch64|arm|mips|mips64|x86)
cd `dirname "$PWD/$0"`
case "$1" in
aarch64|arm|x86)
export CFLAGS="-O3"
;;
mips)
export CFLAGS="-O3 -fPIC"
;;
mips64)
export CFLAGS="-O3 -fPIC -pie -fpic"
;;
esac
case "$1" in
aarch64|arm|mips|mips64)
./android-shell.sh $1 ./android-build.sh $1-static
;;
x86)
./android-shell.sh x86 ./android-build.sh x86
;;
esac
;;
*)
echo "Wrong param: $1"
echo "Usage $0: {aarch64|arm|mips|mips64|x86}"
exit 1
esac

View File

@ -1,4 +0,0 @@
#!/bin/sh
cd `dirname $PWD/$0`
export CFLAGS="-O3"
./android-shell.sh x86 ./android-build.sh x86

View File

@ -211,13 +211,13 @@ BuildAndInstall() {
sys/mingw32.sh
;;
"Android ARM")
sys/android-arm.sh
sys/android-target.sh arm
;;
"Android MIPS")
sys/android-mips.sh
sys/android-target.sh mips
;;
"Android X86")
sys/android-x86.sh
sys/android-target.sh x86
;;
esac
done

View File

@ -40,13 +40,9 @@ fileslist=(
./mk/rapi-list
./sys/afl.sh
./sys/all.sh
./sys/android-aarch64.sh
./sys/android-arm.sh
./sys/android-target.sh
./sys/android-build.sh
./sys/android-mips64.sh
./sys/android-mips.sh
./sys/android-shell.sh
./sys/android-x86.sh
./sys/asan.sh
./sys/bokken.sh
./sys/build-harden.sh