[tor-commits] [orbot/master] Updated BUILD, included instructions for windows

[n8fr8 at torproject.org]

commit 8555dea9b8a84316d70f9e08fa614be3310ff8a4
Author: bim <dsnake at protonmail.com>
Date:   Wed Aug 26 23:25:51 2020 -0400

    Updated BUILD, included instructions for windows
---
 BUILD | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/BUILD b/BUILD
index e137f8bb..1b056861 100644
--- a/BUILD
+++ b/BUILD
@@ -1,15 +1,12 @@
-
 This document explains how to properly build an Android package of Orbot from
 source.
 
-DECEMBER 2017: We have removed the build process for tor and polipo from Orbot,
-and instead now use the new tor-android gradle dependency: https://github.com/n8fr8/tor-android
-
 Orbot includes, in the external directory, git repo submodules of:
 	- JTorControl: The Tor Control Library for Java
+	- BadVPN
+	- JSocks
 
 Please install the following prerequisites (instructions for each follows):
-	ant: http://ant.apache.org/
 	Android Native Dev Kit or NDK (for C/C++ code):
         http://developer.android.com/sdk/ndk/index.html
 	Android Software Dev Kit or SDK (for Java code):
@@ -19,18 +16,29 @@ Be sure that you have all of the git submodules up-to-date:
 
 	git submodule update --init --recursive
 
-You then need to run "ndk-build" from:
-	
-	cd orbotservice/src/main
-	ndk-build
-	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
 
-Now build the Android app
+You then need to run "ndk-build" and the following commands to compile and prepare Orbot's native code:
+
+	UNIX:	
+		
+		cd orbotservice/src/main
+		ndk-build (located in Android/Sdk/ndk/VERSION/)
+		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
+
+	Windows:
+
+		cd orbotservice\src\main
+		ndk-build.cmd (located in Android\Sdk\ndk\VERSION\) 
+		ren libs\armeabi-v7a\pdnsd pdnsd.so
+		ren libs\arm64-v8a\pdnsd pdnsd.so
+		ren libs\x86\pdnsd pdnsd.so
+		ren libs\x86_64\pdnsd pdnsd.so
+
 
-(gradle / android studio instructions here)
+Now build the Android app using Android Studio/gradle
 
 This will produce an unsigned Orbot package APK.