aboutsummaryrefslogtreecommitdiffstats
path: root/anttasks
diff options
context:
space:
mode:
authorMatt Kopec <matt.kopec@intel.com>2012-02-03 12:47:38 -0500
committerDaniel Malea <daniel.malea@intel.com>2012-02-28 14:47:59 -0500
commit4987af409c704c881be83f9a90b98ce7658e1c46 (patch)
tree7dcbc288274391509fa538fdfb064a2f01fd22db /anttasks
parent9109f4c300ac241beaa6adec77844b81e8fc2552 (diff)
downloadsdk-4987af409c704c881be83f9a90b98ce7658e1c46.zip
sdk-4987af409c704c881be83f9a90b98ce7658e1c46.tar.gz
sdk-4987af409c704c881be83f9a90b98ce7658e1c46.tar.bz2
Enable passing of debug and optimization flags to slang in Ant builds.
Change-Id: I8c6affe825b93eefb7ed60000740aa2783d93a20
Diffstat (limited to 'anttasks')
-rw-r--r--anttasks/src/com/android/ant/RenderScriptTask.java25
1 files changed, 23 insertions, 2 deletions
diff --git a/anttasks/src/com/android/ant/RenderScriptTask.java b/anttasks/src/com/android/ant/RenderScriptTask.java
index 5a71d36..d893d8e 100644
--- a/anttasks/src/com/android/ant/RenderScriptTask.java
+++ b/anttasks/src/com/android/ant/RenderScriptTask.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 The Android Open Source Project
+ * Copyright (C) 2010, 2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,12 +28,14 @@ import java.util.List;
/**
* Task to execute renderscript.
* <p>
- * It expects 5 attributes:<br>
+ * It expects 7 attributes:<br>
* 'executable' ({@link Path} with a single path) for the location of the llvm executable<br>
* 'framework' ({@link Path} with 1 or more paths) for the include paths.<br>
* 'genFolder' ({@link Path} with a single path) for the location of the gen folder.<br>
* 'resFolder' ({@link Path} with a single path) for the location of the res folder.<br>
* 'targetApi' for the -target-api value.<br>
+ * 'optLevel' for the -O optimization level.<br>
+ * 'debug' for -g renderscript debugging.<br>
* <p>
* It also expects one or more inner elements called "source" which are identical to {@link Path}
* elements for where to find .rs files.
@@ -46,6 +48,9 @@ public class RenderScriptTask extends MultiFilesTask {
private String mResFolder;
private final List<Path> mPaths = new ArrayList<Path>();
private int mTargetApi = 0;
+ public enum OptLevel { O0, O1, O2, O3 };
+ private OptLevel mOptLevel;
+ private boolean mDebug = false;
private class RenderScriptProcessor implements SourceProcessor {
@@ -87,6 +92,13 @@ public class RenderScriptTask extends MultiFilesTask {
}
+ if (mDebug) {
+ task.createArg().setValue("-g");
+ }
+
+ task.createArg().setValue("-O");
+ task.createArg().setValue(Integer.toString(mOptLevel.ordinal()));
+
task.createArg().setValue("-target-api");
task.createArg().setValue(mTargetApiStr);
@@ -115,6 +127,7 @@ public class RenderScriptTask extends MultiFilesTask {
System.out.println(String.format(
"Compiling %1$d RenderScript files with -target-api %2$d",
count, mTargetApi));
+ System.out.println(String.format("Optimization Level: %1$d", mOptLevel.ordinal()));
} else {
System.out.println("No RenderScript files to compile.");
}
@@ -173,6 +186,14 @@ public class RenderScriptTask extends MultiFilesTask {
}
}
+ public void setOptLevel(OptLevel optLevel) {
+ mOptLevel = optLevel;
+ }
+
+ public void setDebug(boolean debug) {
+ mDebug = debug;
+ }
+
public Path createSource() {
Path p = new Path(getProject());
mPaths.add(p);