commit 4b2a1dcfba4bb57d8ace4f7ffaaff18bfed7a535 Author: sisbell shane.isbell@gmail.com Date: Sun Jan 19 21:12:07 2020 -0800
Bug 32993: Package Tor With Tor Android Service Project --- projects/tor-android-service/build | 8 ++++++-- projects/tor-android-service/config | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/projects/tor-android-service/build b/projects/tor-android-service/build index 8f8d16d..1a623e5 100644 --- a/projects/tor-android-service/build +++ b/projects/tor-android-service/build @@ -14,9 +14,13 @@ mkdir -p /var/tmp/build $output_dir tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
cd /var/tmp/build/[% project %]-[% c('version') %] -patch -p1 < $rootdir/remove-native-build.patch
-# Remove native files, otherwise build will fail after gradle.patch +# Replace pre-packaged tor library with the latest build +rm -fR service/src/main/jniLibs/* +tar -C service/src/main -xf $rootdir/[% c('input_files_by_name/tor') %]/tor.tar.gz + +# Patch native build. Then remove native files, otherwise build will fail after gradle.patch +patch -p1 < $rootdir/remove-native-build.patch rm -fR service/src/main/jni
# Replace libraries with the config dependencies diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index c2994b7..2f8dd3e 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -22,4 +22,6 @@ input_files: exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - project: tor-onion-proxy-library name: topl + - project: tor + name: tor - filename: remove-native-build.patch