Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36b859a6 authored Apr 05, 2013 by Tim Murray Committed by Android (Google) Code Review Apr 05, 2013

Merge "Specify SDK version for RS graphics tests." into jb-mr2-dev

parents e8d9d2b3 b2cb8e41

tests/RenderScriptTests/FBOTest/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -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)

tests/RenderScriptTests/Fountain/Android.mk

+1 −2

Original line number	Diff line number	Diff line
		@@ -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

tests/RenderScriptTests/HelloWorld/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

tests/RenderScriptTests/MiscSamples/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

tests/RenderScriptTests/ModelViewer/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -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)