From 1eb708f55cc92d2c60630a76757c67f9afe601a6 Mon Sep 17 00:00:00 2001
From: psksvp <psksvp@gmail.com>
Date: Mon, 8 Feb 2021 21:52:00 +1100
Subject: [PATCH] fix android mode did not copy 64bits native lib to gradle
 libs directory

---
 mode/src/processing/mode/android/AndroidBuild.java | 7 +++++--
 mode/templates/ARBuildECJ.gradle.tmpl              | 5 +++++
 mode/templates/AppBuild.gradle.tmpl                | 5 +++++
 mode/templates/AppBuildECJ.gradle.tmpl             | 5 +++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/mode/src/processing/mode/android/AndroidBuild.java b/mode/src/processing/mode/android/AndroidBuild.java
index 3cbee090..e6eba23a 100644
--- a/mode/src/processing/mode/android/AndroidBuild.java
+++ b/mode/src/processing/mode/android/AndroidBuild.java
@@ -792,9 +792,12 @@ private void copyImportedLibs(final File libsFolder,
           System.err.println(AndroidMode.getTextString("android_build.error.export_file_does_not_exist", exportFile.getName()));
         } else if (exportFile.isDirectory()) {
           // Copy native library folders to the correct location
-          if (exportName.equals("armeabi") ||
+          if (exportName.equals("armeabi")     ||
               exportName.equals("armeabi-v7a") ||
-              exportName.equals("x86")) {
+              exportName.equals("x86")         ||
+              exportName.equals("arm64-v8a")   ||
+              exportName.equals("x86_64")) 
+          {
             Util.copyDir(exportFile, new File(libsFolder, exportName));
           }
           // Copy jni libraries (.so files) to the correct location
diff --git a/mode/templates/ARBuildECJ.gradle.tmpl b/mode/templates/ARBuildECJ.gradle.tmpl
index 87b067f1..040421b0 100644
--- a/mode/templates/ARBuildECJ.gradle.tmpl
+++ b/mode/templates/ARBuildECJ.gradle.tmpl
@@ -1,6 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
+    sourceSets 
+    {
+       main.jni.srcDirs = []
+       main.jniLibs.srcDirs = ['libs']
+    }
     compileSdkVersion @@target_sdk@@
     defaultConfig {
         applicationId "@@package_name@@"
diff --git a/mode/templates/AppBuild.gradle.tmpl b/mode/templates/AppBuild.gradle.tmpl
index 10111794..51f29c3c 100644
--- a/mode/templates/AppBuild.gradle.tmpl
+++ b/mode/templates/AppBuild.gradle.tmpl
@@ -1,6 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
+    sourceSets 
+    {
+       main.jni.srcDirs = []
+       main.jniLibs.srcDirs = ['libs']
+    }
     compileSdkVersion @@target_sdk@@
     defaultConfig {
         applicationId "@@package_name@@"
diff --git a/mode/templates/AppBuildECJ.gradle.tmpl b/mode/templates/AppBuildECJ.gradle.tmpl
index 39476875..1bc1973b 100644
--- a/mode/templates/AppBuildECJ.gradle.tmpl
+++ b/mode/templates/AppBuildECJ.gradle.tmpl
@@ -1,6 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
+    sourceSets 
+    {
+       main.jni.srcDirs = []
+       main.jniLibs.srcDirs = ['libs']
+    }
     compileSdkVersion @@target_sdk@@
     defaultConfig {
         applicationId "@@package_name@@"