Build syncthing x86_64 so variant, fixed in SyncthingNative v1.23.0 (f…

…ixes #583) (#949) * Update syncthing * Update build-syncthing.py
Catfriend1 · Jan 5, 2023 · f10b331 · f10b331
1 parent 0b7c7bc
commit f10b331
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/syncthing/build-syncthing.py b/syncthing/build-syncthing.py
@@ -47,6 +47,12 @@
         'goarch': '386',
         'jni_dir': 'x86',
         'cc': 'i686-linux-android{}-clang',
+    },
+    {
+        'arch': 'x86_64',
+        'goarch': 'amd64',
+        'jni_dir': 'x86_64',
+        'cc': 'x86_64-linux-android{}-clang',
     }
 ]
 
@@ -400,11 +406,4 @@ def install_ndk():
 
     print('*** Finished build for', target['arch'])
 
-print('Copy x86 artifact to x86_64 folder, workaround for issue #583')
-target_dir = os.path.join(project_dir, 'app', 'src', 'main', 'jniLibs', 'x86_64')
-if not os.path.isdir(target_dir):
-    os.makedirs(target_dir)
-shutil.copy(os.path.join(project_dir, 'app', 'src', 'main', 'jniLibs', 'x86', FILENAME_SYNCTHING_BINARY),
-        os.path.join(target_dir, FILENAME_SYNCTHING_BINARY))
-
 print('All builds finished')