Merge "Switch to v8 (and appropriate llvm-rs-cc stuff)." into jb-mr1-dev

Author: stephenhines

tests/RenderScriptTests/ImageProcessing2/Android.mk

@@ -25,6 +25,10 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \
 LOCAL_STATIC_JAVA_LIBRARIES := android.support.v8.renderscript
 
 LOCAL_PACKAGE_NAME := ImageProcessing2
+LOCAL_SDK_VERSION := 8
+LOCAL_RENDERSCRIPT_TARGET_API := 17
+LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE := $(TOPDIR)external/clang/lib/Headers \
+                                        $(TOPDIR)frameworks/rs/scriptc
 
 LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
 LOCAL_REQUIRED_MODULES := librsjni

tests/RenderScriptTests/ImageProcessing2/AndroidManifest.xml

@@ -2,9 +2,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.rs.image2">
-    <uses-sdk android:minSdkVersion="11" />
-    <application android:label="IP GB"
-                 android:hardwareAccelerated="true">
+    <uses-sdk android:minSdkVersion="8" />
+    <application android:label="IP GB">
         <activity android:name="ImageProcessingActivity2">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />