From ed93e44b403a90973b5345fc9da0feb08971b5f3 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Tue, 16 Dec 2014 20:06:42 +0100 Subject: [PATCH] Orbot: Add PIE/noPIE builds; disable for now. --- metadata/org.torproject.android.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/metadata/org.torproject.android.txt b/metadata/org.torproject.android.txt index 9bdaad41d6..28d1444953 100644 --- a/metadata/org.torproject.android.txt +++ b/metadata/org.torproject.android.txt @@ -197,21 +197,23 @@ Build:14.1.3-PIE,130 prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties build=NDK_BASE=$$NDK$$ make -C external -Build:14.1.4-PIE,132 +Build:14.1.4-noPIE,132 + disable=wip commit=v14.1.4 init=git cherry-pick -n 7ee0622a5eaafba284dac81fe58aeb15a478c9c2 && git submodule update submodules=yes rm=libs/jtorctl.jar,external/superuser-commands/RootCommands-Demo - prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties + prebuild=mv AndroidManifest.KITKAT_AND_LOWER.xml AndroidManifest.xml && echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties build=NDK_BASE=$$NDK$$ make -C external buildjni=no -Build:14.1.5-PIE,133 - disable=dummy build/AUM template - commit=v14.1.5 +Build:14.1.4-PIE,133 + disable=wip + commit=v14.1.4 + init=git cherry-pick -n 7ee0622a5eaafba284dac81fe58aeb15a478c9c2 && git submodule update submodules=yes rm=libs/jtorctl.jar,external/superuser-commands/RootCommands-Demo - prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties + prebuild=mv AndroidManifest.LOLLIPOP.xml AndroidManifest.xml && echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties build=NDK_BASE=$$NDK$$ make -C external buildjni=no