[tor-commits] [orbot/master] fix build scripts for new paths

n8fr8 at torproject.org n8fr8 at torproject.org
Thu Oct 13 19:38:51 UTC 2016


commit 268002bc75808ea5f4cb4fb34fc629c614f55f54
Author: Nathan Freitas <nathan at freitas.net>
Date:   Thu Sep 29 12:00:09 2016 -0400

    fix build scripts for new paths
---
 external/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/external/Makefile b/external/Makefile
index e7c4958..99ef3fb 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -230,7 +230,7 @@ tor/configure:
 	 ./autogen.sh
 
 tor/Makefile: tor/configure
-	cp 0001-add-limits.h-to-support-MAX_SIZE-on-Android.patch
+	cp 0001-add-limits.h-to-support-MAX_SIZE-on-Android.patch tor
 	cd tor && \
 		git apply 0001-add-limits.h-to-support-MAX_SIZE-on-Android.patch
 #	cp fix_android_0.2.6.4rc_build.patch tor
@@ -315,8 +315,7 @@ assets: tor polipo iptables pluto
 	-$(STRIP) bin/obfs4proxy
 	-zip ../orbotservice/src/main/assets/$(APP_ABI)/obfs4proxy.mp3 bin/obfs4proxy
 	-$(STRIP) ../app/src/main/libs/$(APP_ABI)/pdnsd
-	-zip ../orbotservice/src/main/assets/$(APP_ABI)/pdnsd.mp3 ../app/src/main/libs/$(APP_ABI)/pdnsd
-	-rm ../app/src/main/libs/$(APP_ABI)/pdnsd
+	-zip ../orbotservice/src/main/assets/$(APP_ABI)/pdnsd.mp3 ../orbotservice/src/main/libs/$(APP_ABI)/pdnsd
 
 assets-clean:
 	-rm ../orbotservice/src/main/assets/$(APP_ABI)/polipo.mp3





More information about the tor-commits mailing list