Fix Orbot PIE/non-PIE builds

* non-PIE build is already fixed since KITKAT_AND_LOWER AM.xml is used
* Set PIEFLAGS for PIE build, also used default AM.xml & forcevercode
This commit is contained in:
أحمد المحمودي (Ahmed El-Mahmoudy) 2014-12-16 21:36:07 +02:00
parent ed93e44b40
commit 72627baa64

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 ^[^-]*$