updates for building

This commit is contained in:
n8fr8 2013-07-22 13:57:10 -04:00
parent edd855f5ad
commit 303ceb416a
10 changed files with 39 additions and 17 deletions

View File

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="lib" path="libs/jtorctl.jar"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>

7
.gitmodules vendored
View File

@ -1,6 +1,6 @@
[submodule "external/openssl-static"]
path = external/openssl-static
url = https://github.com/guardianproject/openssl-android.git
url = https://github.com/guardianproject/android-external-openssl-ndk-static.git
[submodule "external/tor"]
path = external/tor
url = https://git.torproject.org/git/tor.git
@ -15,4 +15,7 @@
url = https://git.torproject.org/git/jtorctl
[submodule "external/obfsproxy"]
path = external/obfsproxy
url = https://git.torproject.org/obfsproxy.git
url = https://git.torproject.org/pluggable-transports/obfsproxy-legacy.git
[submodule "external/ActionBarSherlock"]
path = external/ActionBarSherlock
url = https://github.com/JakeWharton/ActionBarSherlock.git

View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.torproject.android"
android:versionName="v12-beta-tor-0.2.4.15-rc"
android:versionCode="56"
android:versionName="12.0.1"
android:versionCode="57"
android:installLocation="auto"
>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="17"/>
<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="18"/>
<application android:name=".OrbotApp" android:icon="@drawable/ic_launcher"
android:label="@string/app_name"

View File

@ -28,6 +28,15 @@
-->
<property file="ant.properties" />
<!-- if sdk.dir was not set from one of the property file, then
get it from the ANDROID_HOME env var.
This must be done before we load project.properties since
the proguard config can use sdk.dir -->
<property environment="env" />
<condition property="sdk.dir" value="${env.ANDROID_HOME}">
<isset property="env.ANDROID_HOME" />
</condition>
<!-- The project.properties file is created and updated by the 'android'
tool, as well as ADT.
@ -41,7 +50,7 @@
<!-- quick check on sdk.dir -->
<fail
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
unless="sdk.dir"
/>

1
external/ActionBarSherlock vendored Submodule

@ -0,0 +1 @@
Subproject commit c0d437ce4c47cb344e5d96414ffbf5f1a85c26d0

18
external/Makefile vendored
View File

@ -20,9 +20,11 @@ NDK_BASE ?= /usr/local/android-ndk
NDK_PLATFORM_LEVEL ?= 8
NDK_TOOLCHAIN_VERSION=4.6
NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-arm
NDK_UNAME=`uname -s | tr '[A-Z]' '[a-z]'`
#NDK_TOOLCHAIN=$(NDK_BASE)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/$(NDK_UNAME)-x86
NDK_TOOLCHAIN=$(NDK_BASE)/toolchains/arm-linux-androideabi-4.6/prebuilt/$(NDK_UNAME)-x86
NDK_UNAME:=`uname -s | tr '[A-Z]' '[a-z]'`
NDK_PROCESSOR:=`uname -m`
#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)
# to use the real HOST tag, you need the latest libtool files:
# http://stackoverflow.com/questions/4594736/configure-does-not-recognize-androideabi
@ -58,25 +60,25 @@ all: assets
#------------------------------------------------------------------------------#
# openssl-static
openssl-static/obj/local/armeabi/libcrypto.a:
lib/libcrypto.a:
cd openssl-static && \
ndk-build
openssl-static/obj/local/armeabi/libssl.a:
lib/libssl.a:
cp config.sub openssl-static
cp config.guess openssl-static
cd openssl-static && \
ndk-build
openssl-static-build-stamp: openssl-static/obj/local/armeabi/libcrypto.a openssl-static/obj/local/armeabi/libssl.a
openssl-static-build-stamp: lib/libcrypto.a lib/libssl.a
touch openssl-static-build-stamp
openssl-static: openssl-static-build-stamp
test -d lib || mkdir lib
test -d include || mkdir include
test -d include/openssl || mkdir include/openssl
cp openssl-static/obj/local/armeabi/libcrypto.a lib
cp openssl-static/obj/local/armeabi/libssl.a lib
cp openssl-static/obj/local/armeabi/libcrypto.a lib/libcrypto.a
cp openssl-static/obj/local/armeabi/libssl.a lib/libssl.a
cp openssl-static/include/openssl/* include/openssl
openssl-static-clean:

Binary file not shown.

Binary file not shown.

View File

@ -9,4 +9,4 @@
# Project target.
target=android-17
android.library.reference.1=../ActionBarSherlock/library
android.library.reference.1=external/ActionBarSherlock/actionbarsherlock

6
update-ant-build.sh Executable file
View File

@ -0,0 +1,6 @@
#!/bin/sh
# make sure your Android SDK tools path is set in SDK_BASE
android update project --path . --name Orbot --subprojects
android update project --path external/ActionBarSherlock/actionbarsherlock -t android-17