dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove Pluto Go building form this Makefile for now

This commit is contained in:
Nathan Freitas 2016-01-07 10:59:58 -05:00
parent 2288210cc6
commit 0081d005e6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
external/Makefile vendored
View File

@ -275,8 +275,9 @@ polipo-clean:
# PLUTO Pluggable Transports # PLUTO Pluggable Transports
pluto/bin/android_arm/obfs4proxy: pluto/bin/android_arm/obfs4proxy:
cd pluto && \ #don't build for now until we sort out Go SDK
./build.sh # cd pluto && \
# ./build.sh
pluto-build-stamp: pluto/bin/android_arm/obfs4proxy pluto-build-stamp: pluto/bin/android_arm/obfs4proxy
touch pluto-build-stamp touch pluto-build-stamp
@ -287,7 +288,7 @@ pluto: pluto-build-stamp
cp pluto/bin/android_arm/meek-client bin cp pluto/bin/android_arm/meek-client bin
pluto-clean: pluto-clean:
-rm -rf pluto/bin # -rm -rf pluto/bin
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# JTorControl library # JTorControl library

2
external/pluto vendored

@ -1 +1 @@
Subproject commit c9f8799540f329480b084010efb354e6bac8af98 Subproject commit 9ca531b8568a2c1a945568a0c46354da7a7371c5