Merge branch 'master' into 'master'

Correct build instructions for com.polipoid (4)



See merge request !1231
This commit is contained in:
Boris Kraut 2016-02-22 23:15:34 +00:00
commit f1cbf03fab

View file

@ -51,7 +51,7 @@ Build:1.2.0,4
cd polipo/ && \
PATH=$TOOLCHAIN_ARM/bin:$PATH CC=arm-linux-androideabi-gcc EXTRA_DEFINES="-fvisibility=default -fPIE -U __linux__" LDFLAGS="-rdynamic -fPIE -pie" make clean polipo && \
mv polipo ../src/main/assets/polipo-arm && \
PATH=/tmp/toolchain-9-x86/bin:$PATH CC=i686-linux-android-gcc EXTRA_DEFINES="-fvisibility=default -fPIE -U __linux__" LDFLAGS="-rdynamic -fPIE -pie" make clean polipo && \
PATH=$TOOLCHAIN_X86/bin:$PATH CC=i686-linux-android-gcc EXTRA_DEFINES="-fvisibility=default -fPIE -U __linux__" LDFLAGS="-rdynamic -fPIE -pie" make clean polipo && \
mv polipo ../src/main/assets/polipo-x86 && \
cd ../src/main/run-pie/ && \
$TOOLCHAIN_ARM/bin/arm-linux-androideabi-gcc -o run_pie-arm run_pie.c && \