diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-03-26 13:34:01 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-03-28 10:30:58 -0700 |
| commit | 2d15c4298980be69c68c1a7d3a8bf264e7094469 (patch) | |
| tree | efb0ed5f0c24edd66727fe16c17989e47ff523a7 /files | |
| parent | fdecd2e9a9581829f06a3a5021bf29ab4f308d30 (diff) | |
| download | sdk-2d15c4298980be69c68c1a7d3a8bf264e7094469.zip sdk-2d15c4298980be69c68c1a7d3a8bf264e7094469.tar.gz sdk-2d15c4298980be69c68c1a7d3a8bf264e7094469.tar.bz2 | |
RS Ant support: split opt level per build type.
Also make sure the Renderscript files are rebuilt when the build type
(debug/release) changes.
Change-Id: I688fc3f8550e3133ee32de3ef074efa75ccc3b67
Diffstat (limited to 'files')
| -rw-r--r-- | files/ant/build.xml | 11 |
1 files changed, 8 insertions, 3 deletions
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> |