[tor-commits] [orbot/master] build jtorctl directly, using a symlink to point to its source code

[n8fr8 at torproject.org]

commit 72eab39a95794fa5f7a6ff73e7b38abc185c6454
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Thu Jan 14 20:57:30 2016 +0100

    build jtorctl directly, using a symlink to point to its source code
    
    This builds the jtorctl java with the rest of Orbot's java.  The process of
    making a jar breaks when external/Makefile is run with frozen time using
    faketime.  That is needed to get reproducible native bits.
---
 external/Makefile |   31 ++++---------------------------
 src/net           |    1 +
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/external/Makefile b/external/Makefile
index ae7db87..e25cd0d 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -199,7 +199,7 @@ iptables/Makefile:
 	cp config.sub iptables
 	cp config.guess iptables
 	cd iptables && \
- 		CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" \
+		CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" \
 			./configure --host=$(HOST) --disable-shared --enable-static 
 
 iptables-build-stamp: iptables/Makefile
@@ -291,34 +291,12 @@ pluto-clean:
 #	-rm -rf pluto/bin
 
 #------------------------------------------------------------------------------#
-# JTorControl library
-
-jtorctl/bin/jtorctl.jar:
-	test -d jtorctl/bin || mkdir jtorctl/bin
-	cd jtorctl && \
-		javac -source 1.6 -target 1.6 net/freehaven/tor/control/TorControlConnection.java -d bin
-	cd jtorctl/bin && \
-		jar cvf jtorctl.jar *
-
-jtorctl-build-stamp: jtorctl/bin/jtorctl.jar
-	touch jtorctl-build-stamp
-
-jtorctl: jtorctl-build-stamp
-	test -d bin || mkdir bin
-	cp jtorctl/bin/jtorctl.jar bin
-
-jtorctl-clean:
-	-rm -rf jtorctl/bin
-	-rm jtorctl-build-stamp
-
-#------------------------------------------------------------------------------#
 #create and clean assets: FYI - tor is stored as a ZIP file with an mp3 extension
 #in order to stop Android OS (older devices) from trying to compress/decompress it
 #this is related to a bug in compression of assets and resources > 1MB
 
-assets: tor polipo jtorctl iptables pluto
+assets: tor polipo iptables pluto
 	install -d ../libs
-	install bin/jtorctl.jar ../libs
 	install -d ../assets/$(APP_ABI)
 	-$(STRIP) bin/polipo
 	-zip ../assets/$(APP_ABI)/polipo.mp3 bin/polipo
@@ -341,13 +319,12 @@ assets-clean:
 	-rm ../assets/$(APP_ABI)/meek-client.mp3
 	-rm ../assets/$(APP_ABI)/obfs4proxy.mp3
 	-rm ../assets/$(APP_ABI)/pdnsd.mp3
-	-rm ../libs/jtorctl.jar
 
 #------------------------------------------------------------------------------#
 # cleanup, cleanup, put the toys away
 
-##clean: openssl-clean libevent-clean tor-clean polipo-clean jtorctl-clean assets-clean
-clean: openssl-clean libevent-clean tor-clean polipo-clean iptables-clean jtorctl-clean pluto-clean
+##clean: openssl-clean libevent-clean tor-clean polipo-clean assets-clean
+clean: openssl-clean libevent-clean tor-clean polipo-clean iptables-clean pluto-clean
 
 #------------------------------------------------------------------------------#
 # debugging stuff
diff --git a/src/net b/src/net
new file mode 120000
index 0000000..ab37141
--- /dev/null
+++ b/src/net
@@ -0,0 +1 @@
+../external/jtorctl/net/
\ No newline at end of file