commit 2655088ae63242d8f3728dfcb4b1f56c9d1c3ae0 Author: n8fr8 nathan@freitas.net Date: Tue Jun 19 20:44:06 2012 -0400

removed gcc ssp hardening

ssp_noshared not currently available in Android NDK --- external/Makefile | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/external/Makefile b/external/Makefile index ab5385a..9721dd8 100644 --- a/external/Makefile +++ b/external/Makefile @@ -132,7 +132,11 @@ tor/Makefile: tor/configure --prefix=$(NDK_TOOLCHAIN) \ --disable-asciidoc \ --with-libevent-dir=$(EXTERNAL_ROOT) --enable-static-libevent \ - --with-openssl-dir=$(EXTERNAL_ROOT) --enable-static-openssl + --with-openssl-dir=$(EXTERNAL_ROOT) --enable-static-openssl \ + --disable-gcc-hardening + +## --disable-linker-hardening --disable-gcc-hardening +

tor-build-stamp: tor/Makefile $(MAKE) -C tor @@ -223,7 +227,7 @@ privoxy-clean: jtorctl/bin/jtorctl.jar: test -d jtorctl/bin || mkdir jtorctl/bin cd jtorctl && \ - javac net/freehaven/tor/control/TorControlConnection.java -d bin + javac -source 1.6 -target 1.6 net/freehaven/tor/control/TorControlConnection.java -d bin cd jtorctl/bin && \ jar cvf jtorctl.jar *