From 72627baa64568bc32a5c76bf2714e4876d0f33bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=A3=D8=AD=D9=85=D8=AF=20=D8=A7=D9=84=D9=85=D8=AD=D9=85?=
 =?UTF-8?q?=D9=88=D8=AF=D9=8A=20=28Ahmed=20El-Mahmoudy=29?=
 <aelmahmoudy@users.sourceforge.net>
Date: Tue, 16 Dec 2014 21:36:07 +0200
Subject: [PATCH] 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
---
 metadata/org.torproject.android.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/metadata/org.torproject.android.txt b/metadata/org.torproject.android.txt
index 28d1444953..28a0526faf 100644
--- a/metadata/org.torproject.android.txt
+++ b/metadata/org.torproject.android.txt
@@ -198,7 +198,6 @@ Build:14.1.3-PIE,130
     build=NDK_BASE=$$NDK$$ make -C external
 
 Build:14.1.4-noPIE,132
-    disable=wip
     commit=v14.1.4
     init=git cherry-pick -n 7ee0622a5eaafba284dac81fe58aeb15a478c9c2 && git submodule update
     submodules=yes
@@ -208,14 +207,14 @@ Build:14.1.4-noPIE,132
     buildjni=no
 
 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=mv AndroidManifest.LOLLIPOP.xml AndroidManifest.xml && echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties
-    build=NDK_BASE=$$NDK$$ make -C external
+    prebuild=echo 'target=android-17' >> external/superuser-commands/RootCommands-Library/project.properties
+    build=NDK_BASE=$$NDK$$ make -C external PIEFLAGS="-fPIE -pie"
     buildjni=no
+    forcevercode=yes
 
 Auto Update Mode:Version %v
 Update Check Mode:Tags ^[^-]*$