From d4a4b452bc422b6bc9b22cacf54e9e3105c98925 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Fri, 15 Aug 2014 16:03:58 -0700 Subject: [PATCH] We need to specify a target SDK < 21 to use graphics RS. Bug: 16031597 This change also removes some unnecessary code from ScriptC construction. Change-Id: I6680109deb34de841dfade769d556f5060aee423 --- .../CanvasCompare/src/com/android/test/hwuicompare/ErrorCalculator.java | 2 +- tests/RenderScriptTests/FountainFbo/Android.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/CanvasCompare/src/com/android/test/hwuicompare/ErrorCalculator.java b/tests/CanvasCompare/src/com/android/test/hwuicompare/ErrorCalculator.java index 08d7667c6acf..d402699b0979 100644 --- a/tests/CanvasCompare/src/com/android/test/hwuicompare/ErrorCalculator.java +++ b/tests/CanvasCompare/src/com/android/test/hwuicompare/ErrorCalculator.java @@ -54,7 +54,7 @@ public class ErrorCalculator { for (int i = 0; i < rowIndices.length; i++) rowIndices[i] = i * REGION_SIZE; - mScript = new ScriptC_errorCalculator(mRS, resources, R.raw.errorcalculator); + mScript = new ScriptC_errorCalculator(mRS); mScript.set_HEIGHT(height); mScript.set_WIDTH(width); mScript.set_REGION_SIZE(REGION_SIZE); diff --git a/tests/RenderScriptTests/FountainFbo/Android.mk b/tests/RenderScriptTests/FountainFbo/Android.mk index 4535eb1c0469..c0f332328ded 100644 --- a/tests/RenderScriptTests/FountainFbo/Android.mk +++ b/tests/RenderScriptTests/FountainFbo/Android.mk @@ -25,5 +25,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-fil # LOCAL_SDK_VERSION := current LOCAL_PACKAGE_NAME := RsFountainFbo +LOCAL_SDK_VERSION := 14 include $(BUILD_PACKAGE) -- 2.11.0