From aeea44bf6a4a49527eccfa4c437c287e885366b0 Mon Sep 17 00:00:00 2001 From: benfry Date: Sat, 24 Nov 2012 15:53:27 +0000 Subject: [PATCH] copy res folder if present in Android sketches --- app/src/processing/mode/android/AndroidBuild.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/processing/mode/android/AndroidBuild.java b/app/src/processing/mode/android/AndroidBuild.java index 7c7a3df28..f65b35ef2 100644 --- a/app/src/processing/mode/android/AndroidBuild.java +++ b/app/src/processing/mode/android/AndroidBuild.java @@ -143,7 +143,9 @@ class AndroidBuild extends JavaBuild { writeBuildXML(buildFile, sketch.getName()); writeProjectProps(new File(tmpFolder, "project.properties")); writeLocalProps(new File(tmpFolder, "local.properties")); - writeRes(new File(tmpFolder, "res"), sketchClassName); + + final File resFolder = new File(tmpFolder, "res"); + writeRes(resFolder, sketchClassName); // new location for SDK Tools 17: /opt/android/tools/proguard/proguard-android.txt // File proguardSrc = new File(sdk.getSdkFolder(), "tools/lib/proguard.cfg"); @@ -167,6 +169,13 @@ class AndroidBuild extends JavaBuild { if (sketchDataFolder.exists()) { Base.copyDir(sketchDataFolder, assetsFolder); } + + // Do the same for the 'res' folder. + // http://code.google.com/p/processing/issues/detail?id=767 + final File sketchResFolder = new File(sketch.getFolder(), "res"); + if (sketchResFolder.exists()) { + Base.copyDir(sketchResFolder, resFolder); + } } return tmpFolder; }