diff options
| author | Stephen Hines <srhines@google.com> | 2014-08-15 16:03:58 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-08-20 17:20:51 -0700 |
| commit | d4a4b452bc422b6bc9b22cacf54e9e3105c98925 (patch) | |
| tree | 60abb11a3a5cb9f3208f5a2730dc79a7b7a059fe | |
| parent | 38dd601d0abd92a9010aa8e894f6490b445f129b (diff) | |
| download | frameworks_base-d4a4b452bc422b6bc9b22cacf54e9e3105c98925.zip frameworks_base-d4a4b452bc422b6bc9b22cacf54e9e3105c98925.tar.gz frameworks_base-d4a4b452bc422b6bc9b22cacf54e9e3105c98925.tar.bz2 | |
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
| -rw-r--r-- | tests/CanvasCompare/src/com/android/test/hwuicompare/ErrorCalculator.java | 2 | ||||
| -rw-r--r-- | tests/RenderScriptTests/FountainFbo/Android.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/CanvasCompare/src/com/android/test/hwuicompare/ErrorCalculator.java b/tests/CanvasCompare/src/com/android/test/hwuicompare/ErrorCalculator.java index 08d7667..d402699 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 4535eb1..c0f3323 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) |