Fix compilation errors using gcc from Android NDK.

[cycript.git] / android.sh

diff --git a/android.sh b/android.sh
index 8cac85329a2608e26366aeab4ef4f236c49c93eb..d155b1b02321f33342c0e7c4d8c3a50d0931758e 100755 (executable)
--- a/android.sh
+++ b/android.sh
@@ -2,10 +2,12 @@
 ndk=~/bin/android-ndk
 abi=armeabi
 ver=4.9
-bin=${ndk}/toolchains/arm-linux-androideabi-${ver}/prebuilt/darwin-x86_64/bin
+api=9
+bld=darwin-x86_64
+bin=${ndk}/toolchains/arm-linux-androideabi-${ver}/prebuilt/${bld}/bin
 #export PATH=${bin}:$PATH
 flg=()
-flg+=(--sysroot=${ndk}/platforms/android-9/arch-arm)
+flg+=(--sysroot=${ndk}/platforms/android-${api}/arch-arm)
 flg+=(-I${ndk}/sources/cxx-stl/gnu-libstdc++/${ver}/include)
 flg+=(-I${ndk}/sources/cxx-stl/gnu-libstdc++/${ver}/libs/${abi}/include)
 ldf=()
@@ -14,8 +16,11 @@ ldf+=(-lgnustl_static)
 tgt=arm-linux-androideabi
 cc=${bin}/${tgt}-gcc
 cxx=${bin}/${tgt}-g++
+cpp=()
+cpp+=(-fPIE)
+ldf+=(-rdynamic -fPIE -pie)
 function cfg() {
     cfg=$1
     shift
-    CC="${cc} ${flg[*]}" CXX="${cxx} ${flg[*]}" OBJCXX="${cxx} ${flg[*]}" "${cfg}" --host="${tgt}" LDFLAGS="${ldf[*]}" "$@"
+    CC="${cc} ${flg[*]}" CXX="${cxx} ${flg[*]}" OBJCXX="${cxx} ${flg[*]}" "${cfg}" --host="${tgt}" CPPFLAGS="${cpp[*]}" LDFLAGS="${ldf[*]}" "$@"
 }