aboutsummaryrefslogtreecommitdiffstats
path: root/files
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@google.com>2013-07-25 12:13:03 -0700
committerXavier Ducrohet <xav@google.com>2013-07-25 12:13:03 -0700
commit6cec7a7af4d4ae20424566ee1fc43d4ec00476d6 (patch)
treecdd500dcc7cff34bf8879ce12e2edb058d3c11a0 /files
parent88d4ec3d86fbb8639657df640f38426df561d328 (diff)
downloadsdk-6cec7a7af4d4ae20424566ee1fc43d4ec00476d6.zip
sdk-6cec7a7af4d4ae20424566ee1fc43d4ec00476d6.tar.gz
sdk-6cec7a7af4d4ae20424566ee1fc43d4ec00476d6.tar.bz2
Support dynamically linked llvm-rs-cc
Change-Id: I4f8ef81c7a2b5a9bccb2cf6283b80fe9bbe4cc64
Diffstat (limited to 'files')
-rw-r--r--files/ant/build.xml3
1 files changed, 1 insertions, 2 deletions
diff --git a/files/ant/build.xml b/files/ant/build.xml
index ac120fd..1c3f82d 100644
--- a/files/ant/build.xml
+++ b/files/ant/build.xml
@@ -480,7 +480,6 @@
<property name="aidl" location="${android.build.tools.dir}/aidl${exe}" />
<property name="aapt" location="${android.build.tools.dir}/aapt${exe}" />
<property name="dx" location="${android.build.tools.dir}/dx${bat}" />
- <property name="renderscript" location="${android.build.tools.dir}/llvm-rs-cc${exe}"/>
<!-- Renderscript include Path -->
<path id="android.renderscript.include.path">
@@ -662,7 +661,7 @@
<echo level="info">Handling RenderScript files...</echo>
<!-- set the rs target prop in case it hasn't been set. -->
<property name="renderscript.target" value="${project.minSdkVersion}" />
- <renderscript executable="${renderscript}"
+ <renderscript buildToolsRoot="${android.build.tools.dir}"
includePathRefId="android.renderscript.include.path"
genFolder="${gen.absolute.dir}"
resFolder="${out.res.absolute.dir}/raw"