Skip to content

Commit cb99af6

Browse files
committed
started to work on gradle build
1 parent 4a71550 commit cb99af6

File tree

1 file changed

+23
-3
lines changed

1 file changed

+23
-3
lines changed

src/processing/mode/android/AndroidBuild.java

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import processing.app.Library;
3232
import processing.app.Messages;
3333
import processing.app.Platform;
34+
import processing.app.Preferences;
3435
import processing.app.Sketch;
3536
import processing.app.SketchException;
3637
import processing.app.Util;
@@ -94,7 +95,6 @@ class AndroidBuild extends JavaBuild {
9495
static public final String wear_version = "2.0.0";
9596
static public final String gvr_sdk_version = "1.10.0";
9697

97-
9898
private boolean runOnEmulator = false;
9999
private int appComponent = FRAGMENT;
100100
private boolean rewriteManifest = false;
@@ -751,6 +751,12 @@ public File exportProject() throws IOException, SketchException {
751751
// this will set debuggable to true in the .xml file
752752
target = "debug";
753753

754+
String buildSystem = Preferences.get("android.build.system");
755+
if (buildSystem == null) {
756+
buildSystem = "gradle";
757+
Preferences.set("android.build.system", buildSystem);
758+
}
759+
754760
if (appComponent == WATCHFACE) {
755761
// We are building a watchface not to run on the emulator. We need the
756762
// handheld app:
@@ -761,15 +767,24 @@ public File exportProject() throws IOException, SketchException {
761767
File projectFolder = createHandheldProject(wearFolder, null);
762768
if (projectFolder != null) {
763769
File exportFolder = createExportFolder();
764-
Util.copyDir(projectFolder, exportFolder);
770+
if (buildSystem.equals("gradle")) {
771+
createGradleProject(projectFolder, exportFolder);
772+
} else { // ant
773+
Util.copyDir(projectFolder, exportFolder);
774+
}
765775
return exportFolder;
766776
}
767777
return null;
768778
} else {
769779
File projectFolder = createProject(false);
770780
if (projectFolder != null) {
771781
File exportFolder = createExportFolder();
772-
Util.copyDir(projectFolder, exportFolder);
782+
if (buildSystem.equals("gradle")) {
783+
createGradleProject(projectFolder, exportFolder);
784+
} else { // ant
785+
Util.copyDir(
786+
projectFolder, exportFolder);
787+
}
773788
return exportFolder;
774789
}
775790
return null;
@@ -1496,6 +1511,11 @@ public void cleanup() {
14961511
}
14971512

14981513

1514+
protected void createGradleProject(File projectFolder, File exportFolder) {
1515+
1516+
}
1517+
1518+
14991519
// Some leftovers from earlier versions of the mode, probably should remove at some point...
15001520
/*
15011521
// SDK tools 17 have a problem where 'dex' won't pick up the libs folder

0 commit comments

Comments
 (0)