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

update makefile for new install process 

update tags for libevent and tor
This commit is contained in:
Nathan Freitas 2013-12-27 11:14:11 -05:00
parent d236708e41
commit 4d6e0cca96
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
external/Makefile vendored
View File

@ -300,20 +300,20 @@ jtorctl-clean:
#this is related to a bug in compression of assets and resources > 1MB #this is related to a bug in compression of assets and resources > 1MB
assets: tor privoxy jtorctl obfsproxy simple assets: tor privoxy jtorctl obfsproxy simple
install -d ../res/raw install -d ../libs/armeabi
install -d ../libs install -d ../libs
install bin/privoxy ../res/raw install bin/privoxy ../libs/armeabi/libprivoxy.so
install bin/obfsproxy ../res/raw install bin/obfsproxy ../libs/armeabi/libobfsproxy.so
install bin/jtorctl.jar ../libs install bin/jtorctl.jar ../libs
install bin/simple.jar ../libs install bin/simple.jar ../libs
cd bin && \ install bin/tor ../libs/armeabi/libtor.so
zip ../../res/raw/tor.mp3 tor
assets-clean: assets-clean:
-rm ../res/raw/tor.mp3 -rm ../libs/armeabi/libtor.so
-rm ../res/raw/privoxy -rm ../libs/armeabi/libprivoxy.so
-rm ../libs/* -rm ../libs/armeabi/libobfsproxy.so
-rm ../res/raw/obfsproxy -rm ../libs/jtorctl.jar
-rm ../libs/simple.jar
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# cleanup, cleanup, put the toys away # cleanup, cleanup, put the toys away

2
external/libevent vendored

@ -1 +1 @@
Subproject commit 5a12d8359727e8f10d08f8cd2b36c9f78747908f Subproject commit ce46db99b94389a8fed0248f64f88d047cdac416

2
external/tor vendored

@ -1 +1 @@
Subproject commit 889e9bd5292972842eb6d02dbce2c6589dd3ccfe Subproject commit e719d05fd296a9dd59af9becb21ef3ff1c426b3c