diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-07-10 18:54:13 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-07-10 18:54:14 -0700 |
| commit | 538547daabd38c0d341074c2bff470d299bd4a48 (patch) | |
| tree | e15a958f105a2cbe63d23d215c78f196b3775e12 | |
| parent | b4547eca1ceb744c6786efbe2fd6a3e04cfd1323 (diff) | |
| parent | 662db9123554e1b067d95e4590f2cf543b4e4f8f (diff) | |
| download | sdk-538547daabd38c0d341074c2bff470d299bd4a48.zip sdk-538547daabd38c0d341074c2bff470d299bd4a48.tar.gz sdk-538547daabd38c0d341074c2bff470d299bd4a48.tar.bz2 | |
Merge "Fix renderscript compilation from Ant."
| -rw-r--r-- | anttasks/src/com/android/ant/RenderScriptTask.java | 9 | ||||
| -rw-r--r-- | files/ant/build.xml | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/anttasks/src/com/android/ant/RenderScriptTask.java b/anttasks/src/com/android/ant/RenderScriptTask.java index b64a731..b480316 100644 --- a/anttasks/src/com/android/ant/RenderScriptTask.java +++ b/anttasks/src/com/android/ant/RenderScriptTask.java @@ -163,8 +163,13 @@ public class RenderScriptTask extends MultiFilesTask { mExecutable = TaskHelper.checkSinglePath("executable", executable); } - public void setIncludePath(Path value) { - mIncludePath = value; + public void setIncludePathRefId(String refId) { + Object path = getProject().getReference(refId); + if (path instanceof Path) { + mIncludePath = (Path) path; + } else if (path != null) { + throw new BuildException(refId + " is expected to reference a Path object."); + } } public void setGenFolder(Path value) { diff --git a/files/ant/build.xml b/files/ant/build.xml index 8edba16..1ec0632 100644 --- a/files/ant/build.xml +++ b/files/ant/build.xml @@ -632,7 +632,7 @@ <echo level="info">----------</echo> <echo level="info">Handling RenderScript files...</echo> <renderscript executable="${renderscript}" - includePath="${android.renderscript.include.path}" + includePathRefId="android.renderscript.include.path" genFolder="${gen.absolute.dir}" resFolder="${out.res.absolute.dir}/raw" targetApi="${project.minSdkVersion}" |