From 931568e04dc377f6fc885256824bc702b07345c0 Mon Sep 17 00:00:00 2001 From: Nathan Freitas Date: Tue, 10 May 2011 02:08:50 +0000 Subject: [PATCH] project file modifications svn:r24737 --- AndroidManifest.xml | 7 +++---- BUILD | 29 ++++++++++++++--------------- CHANGELOG | 2 ++ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f9a69734..1d2aa54c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5" android:versionCode="11"> @@ -46,9 +46,8 @@ - - + + diff --git a/BUILD b/BUILD index 6c24112a..b2e4109e 100644 --- a/BUILD +++ b/BUILD @@ -73,7 +73,7 @@ Fetch and build libevent: cd ~/mydroid/external/libevent svn co https://levent.svn.sourceforge.net/svnroot/levent/tags/release-1.4.12-stable/libevent/ . - export LIBEVENTDIR=`pwd` + export LIBEVENTDIR=`cd $DROID_ROOT/external/libevent && pwd` ./autogen.sh # Put the contents of http://pastebin.ca/1577207 in /tmp/libevent-patch patch < /tmp/libevent-patch @@ -81,14 +81,14 @@ Fetch and build libevent: make Copy over the libevent library: - cp .libs/libevent.a ~/mydroid/out/target/product/generic/obj/lib + cp .libs/libevent.a $DROID_ROOT/out/target/product/generic/obj/lib Fetch and build Tor: - export OPENSSLDIR=`cd ~/mydroid/external/openssl/include/ && pwd` - export ZLIBDIR=`cd ~/mydroid/external/zlib && pwd` + export OPENSSLDIR=`cd $DROID_ROOT/external/openssl/include/ && pwd` + export ZLIBDIR=`cd $DROID_ROOT/external/zlib && pwd` - cd ~/mydroid/external/tor + cd $DROID_ROOT/external/tor git clone git://git.torproject.org/git/tor.git cd tor/ ./autogen.sh @@ -98,17 +98,16 @@ Fetch and build Tor: make At this point, you'll have a Tor binary that can be run on an Android handset. +You can verify the ARM binary was properly built using the following command: + +file src/or/tor + +You should see something like: +src/or/tor: ELF 32-bit LSB executable, ARM, version 1 (SYSV), dynamically linked (uses shared libs), not stripped + This isn't enough though and we'll now sew up the binary into a small package that will handle basic Tor controlling features. -We need to build our Java SOCKS library: - - # If you're in Orbot's directory already... - cd ../asocks/ - ant compile - ant jar - cp bin/jar/asocks.jar ../Orbot/libs - We need to get the TorControl library for Java: (see also https://svn.torproject.org/svn/torctl/trunk/doc/howto.txt) @@ -124,8 +123,8 @@ Finally, we'll make a proper Android package with ant and the Android App SDK: export APP_SDK=~/Documents/projects/android/android-sdk-linux_x86-1.5_r3/tools cd ../Orbot/ - cp ~/mydroid/external/privoxy/privoxy-3.0.12-stable/privoxy assets/privoxy - cp ~/mydroid/external/tor/tor/src/or/tor assets/tor + cp $DROID_ROOT/external/privoxy/privoxy-3.0.12-stable/privoxy assets/privoxy + cp $DROID_ROOT/external/tor/tor/src/or/tor assets/tor $APP_SDK/android update project --name Orbot --target 3 --path . ant release diff --git a/CHANGELOG b/CHANGELOG index a4fa45f4..ece3f5e5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ 1.0.5 +- fixed tor binary installation issue related to max resource size and compression +- updated "start on boot" code to test for proper launch event - updated to Tor 0.2.2.25-alpha binary - moved back to single notification bar id to avoid double entries - cleaned up progress dialog and alert handling to avoid leaky windows