[tor-commits] [tor-browser-build/master] Bug 40195: Remove unused tor-android-service patches

[sysrqb@xxxxxxxxxxxxxx]

commit 2f85c86ab40e57a1ea86a806d9790093e6d9d7af
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date:   Sun Dec 27 10:30:33 2020 +0000

    Bug 40195: Remove unused tor-android-service patches
---
 projects/tor-android-service/disable-daemon.patch  | 19 ------------------
 projects/tor-android-service/maven-local.patch     | 23 ----------------------
 .../tor-android-service/remove-native-build.patch  | 17 ----------------
 3 files changed, 59 deletions(-)

diff --git a/projects/tor-android-service/disable-daemon.patch b/projects/tor-android-service/disable-daemon.patch
deleted file mode 100644
index 5156d77..0000000
--- a/projects/tor-android-service/disable-daemon.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/gradle.properties b/gradle.properties
-index 75f5aba..27d94ab 100644
---- a/gradle.properties
-+++ b/gradle.properties
-@@ -6,7 +6,6 @@
- # http://www.gradle.org/docs/current/userguide/build_environment.html
- # Specifies the JVM arguments used for the daemon process.
- # The setting is particularly useful for tweaking memory settings.
--org.gradle.jvmargs=-Xmx1536m
- # When configured, Gradle will run in incubating parallel mode.
- # This option should only be used with decoupled projects. More details, visit
- # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-@@ -21,4 +20,4 @@ androidplugin=3.4.0
- appcompatVersion=28.0.0
- compileVersion=28
- targetVersion=28
--minVersion=21
-\ No newline at end of file
-+minVersion=21
diff --git a/projects/tor-android-service/maven-local.patch b/projects/tor-android-service/maven-local.patch
deleted file mode 100644
index c52a1d3..0000000
--- a/projects/tor-android-service/maven-local.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/build.gradle b/build.gradle
-index 671edab..c7870e6 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -5,6 +5,7 @@ buildscript {
-     repositories {
-         google()
-         mavenCentral()
-+        mavenLocal()
-     }
-     dependencies {
-         classpath "com.android.tools.build:gradle:${androidplugin}"
-@@ -18,7 +19,8 @@ allprojects {
-     repositories {
-         google()
-         mavenCentral()
-+        mavenLocal()
-         maven { url "https://repo.spring.io/plugins-release"; }
-         maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master"; }
-     }
--}
-\ No newline at end of file
-+}
diff --git a/projects/tor-android-service/remove-native-build.patch b/projects/tor-android-service/remove-native-build.patch
deleted file mode 100644
index 1ddcd94..0000000
--- a/projects/tor-android-service/remove-native-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/service/build.gradle b/service/build.gradle
-index b414557..ae3e203 100644
---- a/service/build.gradle
-+++ b/service/build.gradle
-@@ -16,12 +16,6 @@ android {
-         }
-     }
- 
--    externalNativeBuild {
--        ndkBuild {
--            path "src/main/jni/Android.mk"
--            buildStagingDirectory "./outputs/ndk-build"
--        }
--    }
- 
-     lintOptions {
-         abortOnError false



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits