diff options
| author | Stephen Hines <srhines@google.com> | 2014-08-15 16:03:58 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-08-22 01:04:43 -0700 |
| commit | 28aec0ef24c12bdcec309eeed25736810fe1d115 (patch) | |
| tree | 4edb15367c8f02bb2b02c3bf3e8f722db796f81a /tests | |
| parent | 7a16ffe2e5eed6d299673f8a3061f1a12b3d3ab8 (diff) | |
| download | frameworks_base-28aec0ef24c12bdcec309eeed25736810fe1d115.zip frameworks_base-28aec0ef24c12bdcec309eeed25736810fe1d115.tar.gz frameworks_base-28aec0ef24c12bdcec309eeed25736810fe1d115.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
(cherry picked from commit 8277a692be3c89519e368159e7707c8d35b89475)
Diffstat (limited to 'tests')
| -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 a08b558..9e3ab42 100644 --- a/tests/CanvasCompare/src/com/android/test/hwuicompare/ErrorCalculator.java +++ b/tests/CanvasCompare/src/com/android/test/hwuicompare/ErrorCalculator.java @@ -57,7 +57,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) |