From 56ca991bd727d988a71cabda47bb5ed8d5e0ccdc Mon Sep 17 00:00:00 2001 From: benfry Date: Sun, 5 Aug 2012 13:45:15 +0000 Subject: [PATCH] support native code in Android libraries (issue #1117) --- app/src/processing/mode/android/AndroidBuild.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/processing/mode/android/AndroidBuild.java b/app/src/processing/mode/android/AndroidBuild.java index 6203a7b2a..539d01854 100644 --- a/app/src/processing/mode/android/AndroidBuild.java +++ b/app/src/processing/mode/android/AndroidBuild.java @@ -690,8 +690,15 @@ class AndroidBuild extends JavaBuild { " is mentioned in export.txt, but it's " + "a big fat lie and does not exist."); } else if (exportFile.isDirectory()) { - Base.copyDir(exportFile, new File(assetsFolder, exportName)); - + // Copy native library folders to the correct location + if (exportName.equals("armeabi") || + exportName.equals("armeabi-v7a") || + exportName.equals("x86")) { + Base.copyDir(exportFile, new File(libsFolder, exportName)); + } else { + // Copy any other directory to the assets folder + Base.copyDir(exportFile, new File(assetsFolder, exportName)); + } } else if (exportName.toLowerCase().endsWith(".zip")) { // As of r4 of the Android SDK, it looks like .zip files // are ignored in the libs folder, so rename to .jar