Merge branch 'main' of https://github.com/Catfriend1/syncthing-android

README.md

@@ -68,10 +68,6 @@ Make sure, git (or git.exe) is installed and available on the PATH environment v
 
 ## Build instructions
 
-```
-git clone https://github.com/Catfriend1/syncthing-android.git --recursive
-```
-
 Edit "App_build_and_release.cmd" and set "SKIP_RELEASE_BUILD=1" if you don't need to upload signed releases to Google Play. This will simplify things for you.
 
 ### Build on Linux
@@ -80,6 +76,10 @@ A Linux VM, for example running Debian, is recommended to build this.
 
 Build SyncthingNative and the Syncthing-Android wrapper using the following commands:
 ```
+apt-get -y install git openjdk-11-jdk
+mkdir -p /root/work
+git clone https://github.com/Catfriend1/syncthing-android.git --recursive
+cd /root/work/syncthing-android
 ./gradlew buildNative
 ./gradlew lint assembleDebug
 ```
@@ -95,6 +95,7 @@ To clean up all files generated during build, use the following commands:
 ### Build on Windows
 
 ```
+git clone https://github.com/Catfriend1/syncthing-android.git --recursive
 cd /d "YOUR_CLONED_GIT_ROOT"
 SyncthingNative_update_and_build
 App_build_and_release

syncthing/build-syncthing.py

@@ -212,6 +212,9 @@ def install_go():
     os.environ["PATH"] += os.pathsep + go_bin_path
 
 
+def write_file(fullfn, text):
+    with open(fullfn, 'w') as hFile:
+        hFile.write(text + '\n')
 
 
 def install_ndk():
@@ -265,6 +268,18 @@ def install_ndk():
     if platform.system() == 'Linux':
         print("Setting permissions on NDK executables ...")
         change_permissions_recursive(ndk_home_path, 0o755);
+        #
+        # Fix NDK r23 bug with incomplete path and arguments when calling "clang".
+        ndk_bin_clang = os.path.join(
+            ndk_home_path,
+            'toolchains',
+            'llvm',
+            'prebuilt',
+            PLATFORM_DIRS[platform.system()],
+            'bin',
+            'clang'
+        )
+        write_file (ndk_bin_clang, '`dirname $0`/clang-12 "$@"')
 
     # Add "ANDROID_NDK_HOME" environment variable.
     print('Adding ANDROID_NDK_HOME=\'' + ndk_home_path + '\'')

syncthing/build.gradle

@@ -1,7 +1,7 @@
 task buildNative(type: Exec) {
     inputs.dir("$projectDir/src/")
     outputs.dir("$projectDir/../app/src/main/jniLibs/")
-    executable = 'python'
+    executable = 'python3'
     args = ['-u', './build-syncthing.py']
 }