sudoxreboot/fdroiddata
1
0
Fork 0
mirror of https://github.com/sudoxnym/fdroiddata.git synced 2026-07-13 17:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'orbot' into 'master'

Browse source 
Orbot: Fix PIE build, enable nonPIE build

See merge request !400
This commit is contained in:
Boris Kraut 2014-12-16 20:54:15 +00:00
commit 5aeef78885
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
metadata/org.torproject.android.txt
View file

@ -198,7 +198,6 @@ Build:14.1.3-PIE,130
build=NDK_BASE=$$NDK$$ make -C external build=NDK_BASE=$$NDK$$ make -C external
Build:14.1.4-noPIE,132 Build:14.1.4-noPIE,132
disable=wip
commit=v14.1.4 commit=v14.1.4
init=git cherry-pick -n 7ee0622a5eaafba284dac81fe58aeb15a478c9c2 && git submodule update init=git cherry-pick -n 7ee0622a5eaafba284dac81fe58aeb15a478c9c2 && git submodule update
submodules=yes submodules=yes
@ -208,14 +207,14 @@ Build:14.1.4-noPIE,132
buildjni=no buildjni=no
Build:14.1.4-PIE,133 Build:14.1.4-PIE,133
disable=wip
commit=v14.1.4 commit=v14.1.4
init=git cherry-pick -n 7ee0622a5eaafba284dac81fe58aeb15a478c9c2 && git submodule update init=git cherry-pick -n 7ee0622a5eaafba284dac81fe58aeb15a478c9c2 && git submodule update
submodules=yes submodules=yes
rm=libs/jtorctl.jar,external/superuser-commands/RootCommands-Demo rm=libs/jtorctl.jar,external/superuser-commands/RootCommands-Demo
prebuild=mv AndroidManifest.LOLLIPOP.xml AndroidManifest.xml && echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties
build=NDK_BASE=$$NDK$$ make -C external build=NDK_BASE=$$NDK$$ make -C external PIEFLAGS="-fPIE -pie"
buildjni=no buildjni=no
forcevercode=yes
Auto Update Mode:Version %v Auto Update Mode:Version %v
Update Check Mode:Tags ^[^-]*$ Update Check Mode:Tags ^[^-]*$