diff options
| author | Stephen Hines <srhines@google.com> | 2012-08-21 16:01:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-21 16:01:30 -0700 |
| commit | cdb05977acede73c1362e8365a196839078fc896 (patch) | |
| tree | e651b4973f8a6b95797b9c2f82351d6efddf797b /tests/RenderScriptTests | |
| parent | b4f56b5ea23325a492b61989a94a738be0fe9b8b (diff) | |
| parent | 65b87344006983c079df6665221d0ffbccf2dbf2 (diff) | |
| download | frameworks_base-cdb05977acede73c1362e8365a196839078fc896.zip frameworks_base-cdb05977acede73c1362e8365a196839078fc896.tar.gz frameworks_base-cdb05977acede73c1362e8365a196839078fc896.tar.bz2 | |
Merge "Switch to v8 (and appropriate llvm-rs-cc stuff)." into jb-mr1-dev
Diffstat (limited to 'tests/RenderScriptTests')
| -rw-r--r-- | tests/RenderScriptTests/ImageProcessing2/Android.mk | 4 | ||||
| -rw-r--r-- | tests/RenderScriptTests/ImageProcessing2/AndroidManifest.xml | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/RenderScriptTests/ImageProcessing2/Android.mk b/tests/RenderScriptTests/ImageProcessing2/Android.mk index c81fd93..e05a518 100644 --- a/tests/RenderScriptTests/ImageProcessing2/Android.mk +++ b/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 diff --git a/tests/RenderScriptTests/ImageProcessing2/AndroidManifest.xml b/tests/RenderScriptTests/ImageProcessing2/AndroidManifest.xml index 1ef04c2..20ee053 100644 --- a/tests/RenderScriptTests/ImageProcessing2/AndroidManifest.xml +++ b/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" /> |