commit 11672b3b3a615e7493add5d3b3dae0a7ed960551 Author: sisbell shane.isbell@gmail.com Date: Thu Oct 17 12:35:58 2019 -0700

Bug 30461: Remove unneeded patches for tor-android-service. --- projects/tor-android-service/build | 2 -- projects/tor-android-service/config | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/projects/tor-android-service/build b/projects/tor-android-service/build index 4f5ac9b..8f8d16d 100644 --- a/projects/tor-android-service/build +++ b/projects/tor-android-service/build @@ -15,8 +15,6 @@ 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 -patch -p1 < $rootdir/disable-daemon.patch -patch -p1 < $rootdir/maven-local.patch

# Remove native files, otherwise build will fail after gradle.patch rm -fR service/src/main/jni diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 1ca2cac..492a3e1 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 50d01b1fbc6e776d0b39f42f644137dd25a92c7a +git_hash: e9bbdc6fb25af47ccaf3bace0162125d94812072 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

@@ -29,5 +29,3 @@ input_files: - project: tor-onion-proxy-library name: topl - filename: remove-native-build.patch - - filename: disable-daemon.patch - - filename: maven-local.patch