diff options
| author | Stephen Hines <srhines@google.com> | 2014-08-15 02:14:54 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-08-22 00:59:43 -0700 |
| commit | f751803a997ea790c03eba9dfb0044d026bdf82a (patch) | |
| tree | 284ea558e78e9c666b925059a967f7adeb6d1199 /java | |
| parent | 81cfa2c51d4e8316f9e3519917b7dae7ceeb500d (diff) | |
| download | android_frameworks_rs-f751803a997ea790c03eba9dfb0044d026bdf82a.tar.gz android_frameworks_rs-f751803a997ea790c03eba9dfb0044d026bdf82a.tar.bz2 android_frameworks_rs-f751803a997ea790c03eba9dfb0044d026bdf82a.zip | |
Fix RS tests to prepare for 64-bit compilation.
Bug: 16031597
Change-Id: Id21b1ade6e097804f6c4f9caf765bf2f6ba8037e
(cherry picked from commit 9e8587a917a8783a817a32e54a63f311851dd6e4)
Diffstat (limited to 'java')
| -rw-r--r-- | java/tests/Balls/Android.mk | 1 | ||||
| -rw-r--r-- | java/tests/ImageProcessing2/src/com/android/rs/image/Vignette.java | 6 | ||||
| -rw-r--r-- | java/tests/ImageProcessing_jb/src/com/android/rs/image/Vignette.java | 6 |
3 files changed, 5 insertions, 8 deletions
diff --git a/java/tests/Balls/Android.mk b/java/tests/Balls/Android.mk index 77281ce1..e1cea043 100644 --- a/java/tests/Balls/Android.mk +++ b/java/tests/Balls/Android.mk @@ -22,5 +22,6 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src) LOCAL_PACKAGE_NAME := RsBalls +LOCAL_SDK_VERSION := 14 include $(BUILD_PACKAGE) diff --git a/java/tests/ImageProcessing2/src/com/android/rs/image/Vignette.java b/java/tests/ImageProcessing2/src/com/android/rs/image/Vignette.java index ea6da832..e24c5488 100644 --- a/java/tests/ImageProcessing2/src/com/android/rs/image/Vignette.java +++ b/java/tests/ImageProcessing2/src/com/android/rs/image/Vignette.java @@ -116,11 +116,9 @@ public class Vignette extends TestBase { public void createTest(android.content.res.Resources res) { if (approx) { if (relaxed) - mScript_approx_relaxed = new ScriptC_vignette_approx_relaxed( - mRS, res, R.raw.vignette_approx_relaxed); + mScript_approx_relaxed = new ScriptC_vignette_approx_relaxed(mRS); else - mScript_approx_full = new ScriptC_vignette_approx_full( - mRS, res, R.raw.vignette_approx_full); + mScript_approx_full = new ScriptC_vignette_approx_full(mRS); } else if (relaxed) mScript_relaxed = new ScriptC_vignette_relaxed(mRS); else diff --git a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Vignette.java b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Vignette.java index 3f860fb1..79843867 100644 --- a/java/tests/ImageProcessing_jb/src/com/android/rs/image/Vignette.java +++ b/java/tests/ImageProcessing_jb/src/com/android/rs/image/Vignette.java @@ -120,11 +120,9 @@ public class Vignette extends TestBase { public void createTest(android.content.res.Resources res) { if (approx) { if (relaxed) - mScript_approx_relaxed = new ScriptC_vignette_approx_relaxed( - mRS, res, R.raw.vignette_approx_relaxed); + mScript_approx_relaxed = new ScriptC_vignette_approx_relaxed(mRS); else - mScript_approx_full = new ScriptC_vignette_approx_full( - mRS, res, R.raw.vignette_approx_full); + mScript_approx_full = new ScriptC_vignette_approx_full(mRS); } else if (relaxed) mScript_relaxed = new ScriptC_vignette_relaxed(mRS); else |