eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-24 15:55:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

copy res folder if present in Android sketches

Browse Source
This commit is contained in:
benfry
2012-11-24 15:53:27 +00:00
parent b94c381780
commit aeea44bf6a
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/processing/mode/android/AndroidBuild.java
View File

@@ -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;
}