Updated Orbot patch for building Tor.

orbot-468076e3.patch

-diff -BBur orbot-468076e3/external/Makefile orbot-468076e3-briar/external/Makefile
---- orbot-468076e3af317d65a656d57b1d7b642984ceead6/external/Makefile	2014-01-07 15:47:47.000000000 +0000
-+++ orbot-468076e3af317d65a656d57b1d7b642984ceead6-briar/external/Makefile	2014-01-07 14:27:46.000000000 +0000
-@@ -18,10 +18,13 @@
- # Android NDK setup:
- NDK_BASE ?= /usr/local/android-ndk
- NDK_PLATFORM_LEVEL ?= 8
--NDK_TOOLCHAIN_VERSION=4.6
-+NDK_TOOLCHAIN_VERSION=4.8
- NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-arm
- NDK_UNAME:=`uname -s | tr '[A-Z]' '[a-z]'`
--NDK_PROCESSOR:=`uname -m`
-+NDK_PROCESSOR:=$(shell uname -m)
-+ifeq ($(NDK_PROCESSOR), i686)
-+	NDK_PROCESSOR:=x86
-+endif
- 
- #NDK_TOOLCHAIN=$(NDK_BASE)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/$(NDK_UNAME)-$(NDK_PROCESSOR)
- NDK_TOOLCHAIN=$(NDK_BASE)/toolchains/arm-linux-androideabi-4.6/prebuilt/$(NDK_UNAME)-$(NDK_PROCESSOR)

orbot.patch

+diff --git a/external/Makefile b/external/Makefile
+index 1817783..7712ef8 100644
+--- a/external/Makefile
++++ b/external/Makefile
+@@ -23,15 +23,11 @@ endif
+ 
+ # Android NDK setup
+ NDK_BASE ?= /opt/android-ndk
+-NDK_PLATFORM_LEVEL ?= 9 
+-NDK_ABI=arm
++NDK_PLATFORM_LEVEL ?= 9
++NDK_ABI ?= arm
+ NDK_TOOLCHAIN_VERSION=4.8
+ NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI)
+-APP_ABI=armeabi
+-# NDK platform level, aka APP_PLATFORM, is equivalent to minSdkVersion
+-APP_PLATFORM := android-$(shell sed -n 's,.*android:minSdkVersion="\([0-9][0-9]*\)".*,\1,p' \
+-	$(EXTERNAL_ROOT)/../AndroidManifest.xml)
+-NDK_SYSROOT=$(NDK_BASE)/platforms/$(APP_PLATFORM)/arch-$(NDK_ABI)
++APP_ABI ?= armeabi
+ NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]')
+ ifeq ($(NDK_ABI),x86)
+  HOST = i686-linux-android
+@@ -85,14 +81,14 @@ all: assets
+ lib/libcrypto.a:
+ 	cd openssl && \
+ 		./Configure android -DL_ENDIAN && \
+-		make CC="$(CC)" ANDROID_DEV=$(NDK_BASE)/platforms/android-8/arch-arm /usr build_libs
++		make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr build_libs
+ 
+ lib/libssl.a:
+ 	cp config.sub openssl
+ 	cp config.guess openssl
+ 	cd openssl && \
+ 		./Configure android -DL_ENDIAN && \
+-		make CC="$(CC)" ANDROID_DEV=$(NDK_BASE)/platforms/android-8/arch-arm /usr build_libs
++		make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr build_libs
+ 
+ openssl-build-stamp: lib/libcrypto.a lib/libssl.a
+ 	touch openssl-build-stamp
+@@ -351,8 +347,8 @@ clean: openssl-clean libevent-clean tor-clean polipo-clean jtorctl-clean liballi
+ showsetup:
+ 	@echo "NDK_TOOLCHAIN_VERSION: $(NDK_TOOLCHAIN_VERSION)"
+ 	@echo "NDK_TOOLCHAIN: $(NDK_TOOLCHAIN)"
++	@echo "NDK_PLATFORM_LEVEL: $(NDK_PLATFORM_LEVEL)"
+ 	@echo "NDK_SYSROOT: $(NDK_SYSROOT)"
+-	@echo "APP_PLATFORM: $(APP_PLATFORM)"
+ 	@echo "APP_ABI: $(APP_ABI)"
+ 	@echo "HOST: $(HOST)"
+ 	@echo "CC: $(CC)"