Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 36b859a6: Merge "Specify SDK version for RS graphics tests." into jb-mr2-dev

Browse Source 
* commit '36b859a61f05539ada25a51b77b641d1a6904061':
  Specify SDK version for RS graphics tests.
This commit is contained in:
Tim Murray
2013-04-05 15:53:04 -07:00
committed by Android Git Automerger
parent 1a39d1bff4 36b859a61f
commit 5c3123d1ab
8 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/RenderScriptTests/FBOTest/Android.mk
View File

@@ -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)

3
tests/RenderScriptTests/Fountain/Android.mk
View File

@@ -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

2
tests/RenderScriptTests/HelloWorld/Android.mk
View File

@@ -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)

2
tests/RenderScriptTests/MiscSamples/Android.mk
View File

@@ -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)

2
tests/RenderScriptTests/ModelViewer/Android.mk
View File

@@ -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)

2
tests/RenderScriptTests/PerfTest/Android.mk
View File

@@ -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)

2
tests/RenderScriptTests/SceneGraph/Android.mk
View File

@@ -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)

2
tests/RenderScriptTests/ShadersTest/Android.mk
View File

@@ -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)