Add Renderscript support to the ADT builders.

This uses the new JavaGenerator mechanism so that all that's needed
is to run llvm-rs-cc on a given list and parsing the dependency file
that's created.

Change-Id: Ib4928c980422dfe1944bc720c77bf6ae5be4c34a

2 files changed, 18 insertions, 8 deletions

diff --git a/anttasks/src/com/android/ant/RenderScriptTask.java b/anttasks/src/com/android/ant/RenderScriptTask.java
index f001311..5aa6612 100644
--- a/anttasks/src/com/android/ant/RenderScriptTask.java
+++ b/anttasks/src/com/android/ant/RenderScriptTask.java
@@ -45,7 +45,7 @@ import java.util.List;
 public class RenderScriptTask extends Task {
 
     private String mExecutable;
-    private String mFramework;
+    private Path mFramework;
     private String mGenFolder;
     private String mResFolder;
     private final List<Path> mPaths = new ArrayList<Path>();
@@ -59,7 +59,7 @@ public class RenderScriptTask extends Task {
     }
 
     public void setFramework(Path value) {
-        mFramework = TaskHelper.checkSinglePath("framework", value);
+        mFramework = value;
     }
 
     public void setGenFolder(Path value) {
@@ -127,8 +127,14 @@ public class RenderScriptTask extends Task {
                 task.setExecutable(mExecutable);
                 task.setFailonerror(true);
 
-                task.createArg().setValue("-I");
-                task.createArg().setValue(mFramework);
+                for (String path : mFramework.list()) {
+                    File res = new File(path);
+                    if (res.isDirectory()) {
+                        task.createArg().setValue("-I");
+                        task.createArg().setValue(path);
+                    }
+                }
+
                 task.createArg().setValue("-p");
                 task.createArg().setValue(mGenFolder);
                 task.createArg().setValue("-o");
diff --git a/anttasks/src/com/android/ant/SetupTask.java b/anttasks/src/com/android/ant/SetupTask.java
index c3cedfd..6dc2c0f 100644
--- a/anttasks/src/com/android/ant/SetupTask.java
+++ b/anttasks/src/com/android/ant/SetupTask.java
@@ -199,15 +199,19 @@ public final class SetupTask extends ImportTask {
         String androidAidl = androidTarget.getPath(IAndroidTarget.ANDROID_AIDL);
         antProject.setProperty(AntConstants.PROP_ANDROID_AIDL, androidAidl);
 
-        String androidRS = androidTarget.getPath(IAndroidTarget.ANDROID_RS);
-        antProject.setProperty(AntConstants.PROP_ANDROID_RENDERSCRIPT, androidRS);
+        Path includePath = new Path(antProject);
+        PathElement element = includePath.createPathElement();
+        element.setPath(androidTarget.getPath(IAndroidTarget.ANDROID_RS));
+        element = includePath.createPathElement();
+        element.setPath(androidTarget.getPath(IAndroidTarget.ANDROID_RS_CLANG));
+        antProject.setProperty(AntConstants.PROP_ANDROID_RENDERSCRIPT, includePath.toString());
 
         antProject.setProperty(AntConstants.PROP_AAPT, androidTarget.getPath(IAndroidTarget.AAPT));
         antProject.setProperty(AntConstants.PROP_AIDL, androidTarget.getPath(IAndroidTarget.AIDL));
         antProject.setProperty(AntConstants.PROP_DX, androidTarget.getPath(IAndroidTarget.DX));
         antProject.setProperty(AntConstants.PROP_RENDERSCRIPT,
                 sdkOsPath + SdkConstants.OS_SDK_PLATFORM_TOOLS_FOLDER +
-                    SdkConstants.FN_RENDERSCRIPT);
+                SdkConstants.FN_RENDERSCRIPT);
 
         // sets up the boot classpath
 
@@ -215,7 +219,7 @@ public final class SetupTask extends ImportTask {
         Path bootclasspath = new Path(antProject);
 
         // create a PathElement for the framework jar
-        PathElement element = bootclasspath.createPathElement();
+        element = bootclasspath.createPathElement();
         element.setPath(androidJar);
 
         // create PathElement for each optional library.