[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] r24737: {projects} project file modifications (projects/android/trunk/Orbot)
Author: n8fr8
Date: 2011-05-10 02:08:50 +0000 (Tue, 10 May 2011)
New Revision: 24737
Modified:
projects/android/trunk/Orbot/AndroidManifest.xml
projects/android/trunk/Orbot/BUILD
projects/android/trunk/Orbot/CHANGELOG
Log:
project file modifications
Modified: projects/android/trunk/Orbot/AndroidManifest.xml
===================================================================
--- projects/android/trunk/Orbot/AndroidManifest.xml 2011-05-10 02:08:28 UTC (rev 24736)
+++ projects/android/trunk/Orbot/AndroidManifest.xml 2011-05-10 02:08:50 UTC (rev 24737)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android";
- package="org.torproject.android" android:versionName="0.2.2.22-orbot-alpha-1.0.5.20110503a-dev" android:versionCode="11">
+ package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5" android:versionCode="11">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
@@ -46,9 +46,8 @@
<receiver android:name=".OnBootReceiver">
<intent-filter>
- <action
- android:name="android.intent.action.BOOT_COMPLETED" />
- <category android:name="android.intent.category.HOME" />
+ <action android:name="android.intent.action.BOOT_COMPLETED" />
+ <category android:name="android.intent.category.HOME" />
</intent-filter>
</receiver>
Modified: projects/android/trunk/Orbot/BUILD
===================================================================
--- projects/android/trunk/Orbot/BUILD 2011-05-10 02:08:28 UTC (rev 24736)
+++ projects/android/trunk/Orbot/BUILD 2011-05-10 02:08:50 UTC (rev 24737)
@@ -73,7 +73,7 @@
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 @@
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 @@
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 @@
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
Modified: projects/android/trunk/Orbot/CHANGELOG
===================================================================
--- projects/android/trunk/Orbot/CHANGELOG 2011-05-10 02:08:28 UTC (rev 24736)
+++ projects/android/trunk/Orbot/CHANGELOG 2011-05-10 02:08:50 UTC (rev 24737)
@@ -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
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits