From 7fad699e55bd05de7b1266972b56e9d0b3d1786c Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Sat, 16 May 2015 15:26:50 +0200 Subject: [PATCH] Polipoid: Fix build --- metadata/com.polipoid.txt | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/metadata/com.polipoid.txt b/metadata/com.polipoid.txt index 899b6c04fb..25151c60c8 100644 --- a/metadata/com.polipoid.txt +++ b/metadata/com.polipoid.txt @@ -16,20 +16,6 @@ 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 @@ -40,7 +26,22 @@ Build:1.0.1,2 mv polipo ../assets/ maven=yes +Build:1.1.0,3 + commit=v1.1.0 + submodules=yes + build=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 + Auto Update Mode:None Update Check Mode:Tags Current Version:1.1.0 Current Version Code:3 +