Skip to content

fix android mode did not copy 64bits native lib to gradle libs directory #637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2021
Merged

fix android mode did not copy 64bits native lib to gradle libs directory #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions mode/src/processing/mode/android/AndroidBuild.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions mode/templates/ARBuildECJ.gradle.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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@@"
Expand Down
5 changes: 5 additions & 0 deletions mode/templates/AppBuild.gradle.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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@@"
Expand Down
5 changes: 5 additions & 0 deletions mode/templates/AppBuildECJ.gradle.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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@@"
Expand Down