diff options
| -rw-r--r-- | anttasks/src/com/android/ant/MultiFilesTask.java | 8 | ||||
| -rw-r--r-- | anttasks/src/com/android/ant/RenderScriptTask.java | 7 | ||||
| -rw-r--r-- | files/ant/build.xml | 11 |
3 files changed, 17 insertions, 9 deletions
diff --git a/anttasks/src/com/android/ant/MultiFilesTask.java b/anttasks/src/com/android/ant/MultiFilesTask.java index 4fb1795..3abcafc 100644 --- a/anttasks/src/com/android/ant/MultiFilesTask.java +++ b/anttasks/src/com/android/ant/MultiFilesTask.java @@ -17,7 +17,6 @@ package com.android.ant; import org.apache.tools.ant.Project; -import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.PatternSet.NameEntry; @@ -29,10 +28,10 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; -class MultiFilesTask extends Task { +class MultiFilesTask extends BuildTypedTask { static enum DisplayType { FOUND, COMPILING, REMOVE_OUTPUT, REMOVE_DEP; @@ -103,7 +102,8 @@ class MultiFilesTask extends Task { sourceFiles.remove(sourceFilePath); // check if it needs to be recompiled. - if (graph.dependenciesHaveChanged(false /*printStatus*/)) { + if (hasBuildTypeChanged() || + graph.dependenciesHaveChanged(false /*printStatus*/)) { toCompile.put(sourceFilePath, sourceFolder); } } diff --git a/anttasks/src/com/android/ant/RenderScriptTask.java b/anttasks/src/com/android/ant/RenderScriptTask.java index d893d8e..937ceac 100644 --- a/anttasks/src/com/android/ant/RenderScriptTask.java +++ b/anttasks/src/com/android/ant/RenderScriptTask.java @@ -190,8 +190,11 @@ public class RenderScriptTask extends MultiFilesTask { mOptLevel = optLevel; } - public void setDebug(boolean debug) { - mDebug = debug; + /** Sets the current build type. value is a boolean, true for debug build, false for release */ + @Override + public void setBuildType(String buildType) { + super.setBuildType(buildType); + mDebug = Boolean.valueOf(buildType); } public Path createSource() { diff --git a/files/ant/build.xml b/files/ant/build.xml index 8ed9f80..830919f 100644 --- a/files/ant/build.xml +++ b/files/ant/build.xml @@ -52,6 +52,10 @@ <property name="java.source" value="1.5" /> <property name="java.compilerargs" value="" /> + <!-- Renderscript options --> + <property name="renderscript.debug.opt.level" value="O0" /> + <property name="renderscript.release.opt.level" value="O3" /> + <!-- instrumentation options --> <property name="emma.filter" value="" /> @@ -616,7 +620,8 @@ resFolder="${out.res.absolute.dir}/raw" targetApi="${target.api}" optLevel="${renderscript.opt.level}" - debug="${build.is.packaging.debug}"> + buildType="${build.is.packaging.debug}" + previousBuildType="${build.last.is.packaging.debug}"> <source path="${source.absolute.dir}"/> </renderscript> @@ -939,7 +944,7 @@ <property name="build.is.signing.debug" value="true" /> <!-- Renderscript optimization level: none --> - <property name="renderscript.opt.level" value="O0" /> + <property name="renderscript.opt.level" value="${renderscript.debug.opt.level}" /> </target> @@ -1033,7 +1038,7 @@ <property name="build.is.signing.debug" value="false" /> <!-- Renderscript optimization level: aggressive --> - <property name="renderscript.opt.level" value="O3" /> + <property name="renderscript.opt.level" value="${renderscript.release.opt.level}" /> <if condition="${build.is.packaging.debug}"> <then> |