[tor-commits] [orbot/master] Merge branch 'master' of https://github.com/eighthave/orbot into hans_build_patches

[n8fr8 at torproject.org]

commit 0b024c9efa0456245e0234ee259e0d600f604317
Merge: d54cf74 ca8197f
Author: Nathan Freitas <nathan at freitas.net>
Date:   Thu Jan 2 13:49:33 2014 -0500

    Merge branch 'master' of https://github.com/eighthave/orbot into hans_build_patches
    
    Conflicts:
    	external/Makefile

 BUILD             |    5 +++
 external/Makefile |  124 +++++++++++++++++++++++++++++++++--------------------
 2 files changed, 83 insertions(+), 46 deletions(-)

diff --cc external/Makefile
index 5c7f770,b6771a4..5efe8e6
--- a/external/Makefile
+++ b/external/Makefile
@@@ -302,4 -334,20 +319,19 @@@ assets-clean
  #------------------------------------------------------------------------------#
  # cleanup, cleanup, put the toys away
  
 -clean: openssl-static-clean libevent-clean tor-clean privoxy-clean jtorctl-clean assets-clean
 -
 +clean: openssl-clean libevent-clean tor-clean privoxy-clean jtorctl-clean assets-clean
+ 
+ #------------------------------------------------------------------------------#
+ # debugging stuff
+ 
+ showsetup:
+ 	@echo "NDK_TOOLCHAIN_VERSION: $(NDK_TOOLCHAIN_VERSION)"
+ 	@echo "NDK_TOOLCHAIN: $(NDK_TOOLCHAIN)"
+ 	@echo "NDK_SYSROOT: $(NDK_SYSROOT)"
+ 	@echo "APP_PLATFORM: $(APP_PLATFORM)"
+ 	@echo "APP_ABI: $(APP_ABI)"
+ 	@echo "HOST: $(HOST)"
+ 	@echo "CC: $(CC)"
+ 	@echo "LD: $(LD)"
+ 	@echo "CFLAGS: $(CFLAGS)"
+ 	@echo "LDFLAGS: $(LDFLAGS)"