Merge branch 'master' into 'master'

Update Polipoid to 1.1.0 (3)

See merge request !773
This commit is contained in:
Boris Kraut 2015-05-16 13:26:01 +00:00
commit 1bca466c55

View file

@ -16,6 +16,20 @@ switched to offline browsing mode when the network is disconnected.
Repo Type:git
Repo:https://github.com/splondike/polipoid.git
Build:1.1.0,3
commit=v1.1.0
submodules=yes
init=TOOLCHAIN_8=/tmp/polipoid-toolchain-8 && \
TOOLCHAIN_16=/tmp/polipoid-toolchain-16 && \
$$NDK$$/build/tools/make-standalone-toolchain.sh --platform=android-8 --arch=arm --install-dir=$TOOLCHAIN_8 && \
$$NDK$$/build/tools/make-standalone-toolchain.sh --platform=android-16 --arch=arm --install-dir=$TOOLCHAIN_16 && \
cd polipo/ && \
PATH=$TOOLCHAIN_8/bin:$PATH CC=arm-linux-androideabi-gcc EXTRA_DEFINES="-U __linux__" make clean polipo && \
mv polipo ../src/main/assets/polipo && \
PATH=$TOOLCHAIN_16/bin:$PATH CC=arm-linux-androideabi-gcc EXTRA_DEFINES="-fPIE -U __linux__" LDFLAGS="-fPIE -pie" make clean polipo && \
mv polipo ../src/main/assets/polipo-pie
maven=yes
Build:1.0.1,2
commit=v1.0.1
submodules=yes
@ -28,6 +42,5 @@ Build:1.0.1,2
Auto Update Mode:None
Update Check Mode:Tags
Current Version:1.0.1
Current Version Code:2
Current Version:1.1.0
Current Version Code:3