Update tor build process

akwizgran
2018-03-30 14:59:40 +00:00
parent 7c1b473c04
commit 91b049c509

@@ -1,55 +1,48 @@
* Install the [Android NDK, revision 10e](http://developer.android.com/ndk/downloads/older_releases.html) * Install the [Android NDK](https://developer.android.com/ndk/downloads/)
* `export ANDROID_NDK_HOME=/path/to/ndk` * `export ANDROID_NDK_HOME=/path/to/ndk`
* `git clone https://git.torproject.org/orbot.git` * `git clone https://github.com/n8fr8/tor-android`
* `cd orbot` * `cd tor-android`
* `git checkout e801eaa` * `git submodule update --init`
* `git submodule update --init external/libevent external/openssl external/tor`
* `cd external/libevent` * `cd external/libevent`
* `git checkout release-2.0.22-stable` (or latest stable release) * `git checkout release-2.0.22-stable` (or latest stable release)
* `cd ../openssl` * `cd ../openssl`
* `git checkout OpenSSL_1_0_2o` (or latest stable release) * `git checkout OpenSSL_1_0_2o` (or latest stable release)
* `cd ../tor` * `cd ../tor`
* `git checkout tor-0.2.9.9` (or latest stable release) * `git checkout tor-0.3.2.9` (or latest stable release)
* `patch -p1 < /path/to/briar/patches/tor.patch`
* `git commit -a -m 'Applied hidden service performance patch'`
* `cd ../..` * `cd ../..`
ARM binary with PIE (Android API version 16+): ARM binary with PIE (Android API version 16+):
* `unset APP_ABI` * `unset APP_ABI`
* `unset NDK_PLATFORM_LEVEL` * `unset NDK_PLATFORM_LEVEL`
* `unset PIEFLAGS` * `unset PIEFLAGS`
* `make -C external clean` * `make -C external clean tor`
* `make -C external tor`
* `mv external/bin/tor .` * `mv external/bin/tor .`
* `strip tor` (requires binutils-multiarch) * `strip tor` (requires binutils-multiarch)
* `zip tor-arm-pie.zip tor` * `zip tor_arm_pie.zip tor`
ARM binary without PIE (Android API version 14-15): ARM binary without PIE (Android API version 14-15):
* `unset APP_ABI` * `unset APP_ABI`
* `export NDK_PLATFORM_LEVEL=14` * `export NDK_PLATFORM_LEVEL=14`
* `export PIEFLAGS=` * `export PIEFLAGS=`
* `make -C external clean` * `make -C external clean tor`
* `make -C external tor`
* `mv external/bin/tor .` * `mv external/bin/tor .`
* `strip tor` (requires binutils-multiarch) * `strip tor` (requires binutils-multiarch)
* `zip tor-arm.zip tor` * `zip tor_arm.zip tor`
x86 binary with PIE (Android API version 16+): x86 binary with PIE (Android API version 16+):
* `export APP_ABI=x86` * `export APP_ABI=x86`
* `unset NDK_PLATFORM_LEVEL` * `unset NDK_PLATFORM_LEVEL`
* `unset PIEFLAGS` * `unset PIEFLAGS`
* `make -C external clean` * `make -C external clean tor`
* `make -C external tor`
* `mv external/bin/tor .` * `mv external/bin/tor .`
* `strip tor` (requires binutils-multiarch) * `strip tor` (requires binutils-multiarch)
* `zip tor-x86-pie.zip tor` * `zip tor_x86_pie.zip tor`
x86 binary without PIE (Android API version 14-15): x86 binary without PIE (Android API version 14-15):
* `export APP_ABI=x86` * `export APP_ABI=x86`
* `export NDK_PLATFORM_LEVEL=14` * `export NDK_PLATFORM_LEVEL=14`
* `export PIEFLAGS=` * `export PIEFLAGS=`
* `make -C external clean` * `make -C external clean tor`
* `make -C external tor`
* `mv external/bin/tor .` * `mv external/bin/tor .`
* `strip tor` (requires binutils-multiarch) * `strip tor` (requires binutils-multiarch)
* `zip tor-x86.zip tor` * `zip tor_x86.zip tor`