[tor-commits] [orbot/master] remove Pluto Go building form this Makefile for now

[n8fr8@xxxxxxxxxxxxxx]

commit 0081d005e66e43d864ce8492f87dbed3d1153524
Author: Nathan Freitas <nathan@xxxxxxxxxxx>
Date:   Thu Jan 7 10:59:58 2016 -0500

    remove Pluto Go building form this Makefile for now
---
 external/Makefile |    7 ++++---
 external/pluto    |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/external/Makefile b/external/Makefile
index 1a14869..3e0d898 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -275,8 +275,9 @@ polipo-clean:
 # PLUTO Pluggable Transports
 
 pluto/bin/android_arm/obfs4proxy:
-	cd pluto && \
-		./build.sh
+#don't build for now until we sort out Go SDK 
+#	cd pluto && \
+#		./build.sh
 
 pluto-build-stamp: pluto/bin/android_arm/obfs4proxy
 	touch pluto-build-stamp
@@ -287,7 +288,7 @@ pluto: pluto-build-stamp
 	cp pluto/bin/android_arm/meek-client bin
 
 pluto-clean:
-	-rm -rf pluto/bin
+#	-rm -rf pluto/bin
 
 #------------------------------------------------------------------------------#
 # JTorControl library
diff --git a/external/pluto b/external/pluto
index c9f8799..9ca531b 160000
--- a/external/pluto
+++ b/external/pluto
@@ -1 +1 @@
-Subproject commit c9f8799540f329480b084010efb354e6bac8af98
+Subproject commit 9ca531b8568a2c1a945568a0c46354da7a7371c5



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits