Merge branch 'orbot' into 'master'
Orbot: Update to 15.0.1-RC-2 See merge request !868
This commit is contained in:
Boris Kraut
commit
8c6777a1ea
|
|
@ -340,6 +340,120 @@ Build:15.0.1-RC-1-PIE,15012116
|
|||
buildjni=yes
|
||||
ndk=r10e
|
||||
|
||||
Build:15.0.1-RC-2-noPIE,15012201
|
||||
commit=15.0.1-RC-2
|
||||
submodules=yes
|
||||
patch=nobridge.diff
|
||||
forceversion=yes
|
||||
forcevercode=yes
|
||||
rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3
|
||||
prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \
|
||||
sed -i -e '/APP_ABI/ s/:=.*/:= armeabi armeabi-v7a/' jni/Application.mk && \
|
||||
sed -i -e 's#uses-sdk.*#uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/>#' AndroidManifest.xml
|
||||
build=NDK_BASE=$$NDK$$ make -C external APP_ABI=armeabi PIEFLAGS=""
|
||||
buildjni=yes
|
||||
ndk=r10e
|
||||
|
||||
Build:15.0.1-RC-2-noPIE,15012202
|
||||
commit=15.0.1-RC-2
|
||||
submodules=yes
|
||||
patch=nobridge.diff
|
||||
forceversion=yes
|
||||
forcevercode=yes
|
||||
rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3
|
||||
prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \
|
||||
sed -i -e '/APP_ABI/ s/:=.*/:= x86/' jni/Application.mk && \
|
||||
sed -i -e 's#uses-sdk.*#uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/>#' AndroidManifest.xml
|
||||
build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86 PIEFLAGS=""
|
||||
buildjni=yes
|
||||
ndk=r10e
|
||||
|
||||
Build:15.0.1-RC-2-noPIE,15012203
|
||||
commit=15.0.1-RC-2
|
||||
submodules=yes
|
||||
patch=nobridge.diff
|
||||
forceversion=yes
|
||||
forcevercode=yes
|
||||
rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3
|
||||
prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \
|
||||
sed -i -e '/APP_ABI/ s/:=.*/:= mips/' jni/Application.mk && \
|
||||
sed -i -e 's#uses-sdk.*#uses-sdk android:minSdkVersion="9" android:maxSdkVersion="15" android:targetSdkVersion="15"/>#' AndroidManifest.xml
|
||||
build=NDK_BASE=$$NDK$$ make -C external APP_ABI=mips PIEFLAGS=""
|
||||
buildjni=yes
|
||||
ndk=r10e
|
||||
|
||||
Build:15.0.1-RC-2-PIE,15012211
|
||||
commit=15.0.1-RC-2
|
||||
submodules=yes
|
||||
forcevercode=yes
|
||||
rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy
|
||||
prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \
|
||||
sed -i -e '/APP_ABI/ s/:=.*/:= armeabi armeabi-v7a/' jni/Application.mk
|
||||
build=NDK_BASE=$$NDK$$ make -C external APP_ABI=armeabi PIEFLAGS="-fPIE -pie"
|
||||
buildjni=yes
|
||||
ndk=r10e
|
||||
|
||||
Build:15.0.1-RC-2-PIE,15012212
|
||||
commit=15.0.1-RC-2
|
||||
submodules=yes
|
||||
patch=nobridge.diff
|
||||
forcevercode=yes
|
||||
rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3
|
||||
prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \
|
||||
sed -i -e '/APP_ABI/ s/:=.*/:= x86/' jni/Application.mk
|
||||
build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86 PIEFLAGS="-fPIE -pie"
|
||||
buildjni=yes
|
||||
ndk=r10e
|
||||
|
||||
Build:15.0.1-RC-2-PIE,15012213
|
||||
commit=15.0.1-RC-2
|
||||
submodules=yes
|
||||
patch=nobridge.diff
|
||||
forcevercode=yes
|
||||
rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3
|
||||
prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \
|
||||
sed -i -e '/APP_ABI/ s/:=.*/:= mips/' jni/Application.mk
|
||||
build=NDK_BASE=$$NDK$$ make -C external APP_ABI=mips PIEFLAGS="-fPIE -pie"
|
||||
buildjni=yes
|
||||
ndk=r10e
|
||||
|
||||
Build:15.0.1-RC-2-PIE,15012214
|
||||
commit=15.0.1-RC-2
|
||||
submodules=yes
|
||||
patch=nobridge.diff
|
||||
forcevercode=yes
|
||||
rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3
|
||||
prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \
|
||||
sed -i -e '/APP_ABI/ s/:=.*/:= arm64-v8a/' jni/Application.mk
|
||||
build=NDK_BASE=$$NDK$$ make -C external APP_ABI=arm64-v8a PIEFLAGS="-fPIE -pie" NDK_PLATFORM_LEVEL=21 NDK_TOOLCHAIN_VERSION=4.9
|
||||
buildjni=yes
|
||||
ndk=r10e
|
||||
|
||||
Build:15.0.1-RC-2-PIE,15012215
|
||||
disable=libcrypto.a(eng_rsax.o):eng_rsax.c:function e_rsax_bn_mod_exp: error: undefined reference to 'mod_exp_512'
|
||||
commit=15.0.1-RC-2
|
||||
submodules=yes
|
||||
patch=nobridge.diff
|
||||
forcevercode=yes
|
||||
rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3
|
||||
prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \
|
||||
sed -i -e '/APP_ABI/ s/:=.*/:= x86_64/' jni/Application.mk
|
||||
build=NDK_BASE=$$NDK$$ make -C external APP_ABI=x86_64 PIEFLAGS="-fPIE -pie" NDK_PLATFORM_LEVEL=21 NDK_TOOLCHAIN_VERSION=4.9
|
||||
buildjni=yes
|
||||
ndk=r10e
|
||||
|
||||
Build:15.0.1-RC-2-PIE,15012216
|
||||
commit=15.0.1-RC-2
|
||||
submodules=yes
|
||||
patch=nobridge.diff
|
||||
forcevercode=yes
|
||||
rm=libs/,external/superuser-commands/RootCommands-Demo,external/pluto/plugins/meek/assets/meek-client,external/pluto/plugins/obfs4/assets/obfs4proxy,res/raw/meek.mp3,res/raw/obfs4proxy.mp3
|
||||
prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties && \
|
||||
sed -i -e '/APP_ABI/ s/:=.*/:= mips64/' jni/Application.mk
|
||||
build=NDK_BASE=$$NDK$$ make -C external APP_ABI=mips64 PIEFLAGS="-fPIE -pie" NDK_PLATFORM_LEVEL=21 NDK_TOOLCHAIN_VERSION=4.9
|
||||
buildjni=yes
|
||||
ndk=r10e
|
||||
|
||||
Maintainer Notes:
|
||||
* meekclient & ofbs4proxy are prebuilt with PIE for arm archs only. Hence remove them for other archs & for non-PIE builds.
|
||||
* mips & x86_64 builds fail
|
||||
|
|
|
|||
Loading…
Reference in a new issue