From 91308ed41e99d6d6ffb6117740c3debdd4e08764 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Thu, 15 Sep 2011 18:10:59 -0700
Subject: Pass -target-api to the renderscript compiler.

This allows to use a single llvm executable to target
all API versions.

Change-Id: Ib27f7fc9e54c548d31fc98fc323f439cb99218d5
---
 files/ant/build.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'files')

diff --git a/files/ant/build.xml b/files/ant/build.xml
index 609fcb3..821c49b 100644
--- a/files/ant/build.xml
+++ b/files/ant/build.xml
@@ -176,11 +176,6 @@
     <!-- properties for packaging -->
     <property name="build.packaging.nocrunch" value="true" />
 
-    <!-- Name of the application package extracted from manifest file -->
-    <xpath input="AndroidManifest.xml" expression="/manifest/@package"
-                output="manifest.package" />
-
-
     <!-- ********** Macros ********** -->
 
     <!-- macro to do a task on if project.is.library is false.
@@ -417,6 +412,7 @@
                         projectLibrariesResOut="project.libraries.res"
                         projectLibrariesPackageOut="project.libraries.package"
                         projectLibrariesLibsOut="project.libraries.libs"
+                        targetApiOut="target.api"
                 />
 
                 <!-- sets a few boolean based on android.project.type
@@ -547,7 +543,8 @@
             <renderscript executable="${renderscript}"
                     framework="${android.rs}"
                     genFolder="${gen.absolute.dir}"
-                    resFolder="${resource.absolute.dir}/raw">
+                    resFolder="${resource.absolute.dir}/raw"
+                    targetApi="${target.api}">
                 <source path="${source.absolute.dir}"/>
             </renderscript>
 
@@ -1159,6 +1156,10 @@
     <!-- Uninstalls the package from the default emulator/device -->
     <target name="uninstall"
                 description="Uninstalls the application from a running emulator or device.">
+        <!-- Name of the application package extracted from manifest file -->
+        <xpath input="AndroidManifest.xml" expression="/manifest/@package"
+                output="manifest.package" />
+
         <if>
             <condition>
                 <isset property="manifest.package" />
-- 
cgit v1.1