From b2cb8e41f93e8a26241e3de20e862ffa66dedaa4 Mon Sep 17 00:00:00 2001 From: Tim Murray Date: Fri, 5 Apr 2013 15:17:09 -0700 Subject: Specify SDK version for RS graphics tests. Change-Id: Ia61c753392432b91f91260a9b8769dfd396c259f --- tests/RenderScriptTests/FBOTest/Android.mk | 2 ++ tests/RenderScriptTests/Fountain/Android.mk | 3 +-- tests/RenderScriptTests/HelloWorld/Android.mk | 2 +- tests/RenderScriptTests/MiscSamples/Android.mk | 2 +- tests/RenderScriptTests/ModelViewer/Android.mk | 2 ++ tests/RenderScriptTests/PerfTest/Android.mk | 2 ++ tests/RenderScriptTests/SceneGraph/Android.mk | 2 ++ tests/RenderScriptTests/ShadersTest/Android.mk | 2 ++ 8 files changed, 13 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/RenderScriptTests/FBOTest/Android.mk b/tests/RenderScriptTests/FBOTest/Android.mk index 434d5928d359..7a578d9e4be8 100644 --- a/tests/RenderScriptTests/FBOTest/Android.mk +++ b/tests/RenderScriptTests/FBOTest/Android.mk @@ -23,4 +23,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-fil LOCAL_PACKAGE_NAME := FBOTest +LOCAL_SDK_VERSION := 17 + include $(BUILD_PACKAGE) diff --git a/tests/RenderScriptTests/Fountain/Android.mk b/tests/RenderScriptTests/Fountain/Android.mk index 4a6560b88218..0517aef8434e 100644 --- a/tests/RenderScriptTests/Fountain/Android.mk +++ b/tests/RenderScriptTests/Fountain/Android.mk @@ -21,8 +21,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src) -# TODO: build fails with this set -# LOCAL_SDK_VERSION := current +LOCAL_SDK_VERSION := 17 LOCAL_PACKAGE_NAME := RsFountain diff --git a/tests/RenderScriptTests/HelloWorld/Android.mk b/tests/RenderScriptTests/HelloWorld/Android.mk index 54824f4b43b0..c1c08ec18f33 100644 --- a/tests/RenderScriptTests/HelloWorld/Android.mk +++ b/tests/RenderScriptTests/HelloWorld/Android.mk @@ -23,6 +23,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-fil LOCAL_PACKAGE_NAME := RsHelloWorld -LOCAL_SDK_VERSION := current +LOCAL_SDK_VERSION := 17 include $(BUILD_PACKAGE) diff --git a/tests/RenderScriptTests/MiscSamples/Android.mk b/tests/RenderScriptTests/MiscSamples/Android.mk index bdff46a03ee8..ee3567bf1651 100644 --- a/tests/RenderScriptTests/MiscSamples/Android.mk +++ b/tests/RenderScriptTests/MiscSamples/Android.mk @@ -23,6 +23,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-fil LOCAL_PACKAGE_NAME := RsMiscSamples -LOCAL_SDK_VERSION := current +LOCAL_SDK_VERSION := 17 include $(BUILD_PACKAGE) diff --git a/tests/RenderScriptTests/ModelViewer/Android.mk b/tests/RenderScriptTests/ModelViewer/Android.mk index 18ceac56f5e5..86724cfc3bde 100644 --- a/tests/RenderScriptTests/ModelViewer/Android.mk +++ b/tests/RenderScriptTests/ModelViewer/Android.mk @@ -22,6 +22,8 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src) #LOCAL_STATIC_JAVA_LIBRARIES := android.renderscript +LOCAL_SDK_VERSION := 17 + LOCAL_PACKAGE_NAME := ModelViewer include $(BUILD_PACKAGE) diff --git a/tests/RenderScriptTests/PerfTest/Android.mk b/tests/RenderScriptTests/PerfTest/Android.mk index 0d1e7d2476b6..e9ee771f0c68 100644 --- a/tests/RenderScriptTests/PerfTest/Android.mk +++ b/tests/RenderScriptTests/PerfTest/Android.mk @@ -24,6 +24,8 @@ LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src) #LOCAL_STATIC_JAVA_LIBRARIES := android.renderscript +LOCAL_SDK_VERSION := 17 + LOCAL_PACKAGE_NAME := PerfTest include $(BUILD_PACKAGE) diff --git a/tests/RenderScriptTests/SceneGraph/Android.mk b/tests/RenderScriptTests/SceneGraph/Android.mk index 163a95d19c96..6047305ceb70 100644 --- a/tests/RenderScriptTests/SceneGraph/Android.mk +++ b/tests/RenderScriptTests/SceneGraph/Android.mk @@ -21,6 +21,8 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src) +LOCAL_SDK_VERSION := 17 + LOCAL_PACKAGE_NAME := SceneGraphTest include $(BUILD_PACKAGE) diff --git a/tests/RenderScriptTests/ShadersTest/Android.mk b/tests/RenderScriptTests/ShadersTest/Android.mk index 091259145dae..fb6356e4d81a 100644 --- a/tests/RenderScriptTests/ShadersTest/Android.mk +++ b/tests/RenderScriptTests/ShadersTest/Android.mk @@ -21,6 +21,8 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src) +LOCAL_SDK_VERSION := 17 + LOCAL_PACKAGE_NAME := ShadersTest include $(BUILD_PACKAGE) -- cgit v1.2.3-59-g8ed1b