Merge branch 'master' of github.com:guardianproject/orbot

guardianproject · Jul 21, 2020 · c2cb00f · c2cb00f
2 parents a9168d2 + dc536fc
commit c2cb00f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+# compiled NDK binary artifacts 
+orbotservice/src/main/libs/
+
 # auto-generated files from Android builds
 build.xml
 ant.properties

diff --git a/BUILD b/BUILD
@@ -23,18 +23,11 @@ You then need to run "ndk-build" from:
 
 	cd orbotservice/src/main
 	ndk-build
-	mv libs/armeabi/pdnsd libs/armeabi/pdnsd.so
 	mv libs/armeabi-v7a/pdnsd libs/armeabi-v7a/pdnsd.so
 	mv libs/arm64-v8a/pdnsd libs/arm64-v8a/pdnsd.so
 	mv libs/x86/pdnsd libs/x86/pdnsd.so
 	mv libs/x86_64/pdnsd libs/x86_64/pdnsd.so
 
-This isn't enough though and we'll now sew up the binary into a small package
-that will handle basic Tor controlling features.
-(Doesn't work and should be unnecessary on Android Studio/Android SDK as of 2020!)
-
-	android update project --name Orbot --target android-15 --path .
-
 Now build the Android app
 
 (gradle / android studio instructions here)

diff --git a/FUNDING.yml b/FUNDING.yml
@@ -2,3 +2,4 @@ liberapay: GuardianProject
 patreon: guardianproject
 github:
     - eighthave
+    - bitmold