Split VersionTest and LeakTest from renderscript into renderscriptlegacy
Make sure renderscript test is 64-bit compatible and leave .bc files used in
VersionTest and LeakTest in renderscriptlegacy and it will only be 32-bit
compatible.
bug: 17410631
Change-Id: Iaa1e3754edfb5ac19ee07423e06867ee33e08bb9
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index 6f42ea7..d9af12e 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -106,6 +106,7 @@
CtsPrintTestCases \
CtsProviderTestCases \
CtsRenderscriptTestCases \
+ CtsRenderscriptLegacyTestCases \
CtsRsCppTestCases \
CtsSaxTestCases \
CtsSecurityTestCases \
diff --git a/tests/tests/renderscriptlegacy/Android.mk b/tests/tests/renderscriptlegacy/Android.mk
new file mode 100644
index 0000000..31d8ed9
--- /dev/null
+++ b/tests/tests/renderscriptlegacy/Android.mk
@@ -0,0 +1,33 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := CtsRenderscriptLegacyTestCases
+
+# Don't include this package in any target.
+LOCAL_MODULE_TAGS := optional
+
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_SDK_VERSION := 19
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/renderscriptlegacy/AndroidManifest.xml b/tests/tests/renderscriptlegacy/AndroidManifest.xml
new file mode 100644
index 0000000..0c0498a
--- /dev/null
+++ b/tests/tests/renderscriptlegacy/AndroidManifest.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- Replace all the "example" stuff below with your package name, and
+ remove this comment.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.cts.renderscriptlegacy">
+
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ <application>
+ <uses-library android:name="android.test.runner" />
+ </application>
+
+ <!-- This is a self-instrumenting test package. -->
+ <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:targetPackage="com.android.cts.renderscriptlegacy"
+ android:label="CTS tests of Renderscript component">
+ <meta-data android:name="listener"
+ android:value="com.android.cts.runner.CtsTestRunListener" />
+ </instrumentation>
+
+</manifest>
+
diff --git a/tests/tests/renderscript/res/raw/leak.bc b/tests/tests/renderscriptlegacy/res/raw/leak.bc
similarity index 100%
rename from tests/tests/renderscript/res/raw/leak.bc
rename to tests/tests/renderscriptlegacy/res/raw/leak.bc
Binary files differ
diff --git a/tests/tests/renderscript/res/raw/set_target_api_11.bc b/tests/tests/renderscriptlegacy/res/raw/set_target_api_11.bc
similarity index 100%
rename from tests/tests/renderscript/res/raw/set_target_api_11.bc
rename to tests/tests/renderscriptlegacy/res/raw/set_target_api_11.bc
Binary files differ
diff --git a/tests/tests/renderscript/res/raw/set_target_api_12.bc b/tests/tests/renderscriptlegacy/res/raw/set_target_api_12.bc
similarity index 100%
rename from tests/tests/renderscript/res/raw/set_target_api_12.bc
rename to tests/tests/renderscriptlegacy/res/raw/set_target_api_12.bc
Binary files differ
diff --git a/tests/tests/renderscript/res/raw/set_target_api_13.bc b/tests/tests/renderscriptlegacy/res/raw/set_target_api_13.bc
similarity index 100%
rename from tests/tests/renderscript/res/raw/set_target_api_13.bc
rename to tests/tests/renderscriptlegacy/res/raw/set_target_api_13.bc
Binary files differ
diff --git a/tests/tests/renderscript/res/raw/set_target_api_14.bc b/tests/tests/renderscriptlegacy/res/raw/set_target_api_14.bc
similarity index 100%
rename from tests/tests/renderscript/res/raw/set_target_api_14.bc
rename to tests/tests/renderscriptlegacy/res/raw/set_target_api_14.bc
Binary files differ
diff --git a/tests/tests/renderscript/res/raw/set_target_api_15.bc b/tests/tests/renderscriptlegacy/res/raw/set_target_api_15.bc
similarity index 100%
rename from tests/tests/renderscript/res/raw/set_target_api_15.bc
rename to tests/tests/renderscriptlegacy/res/raw/set_target_api_15.bc
Binary files differ
diff --git a/tests/tests/renderscript/res/raw/set_target_api_16.bc b/tests/tests/renderscriptlegacy/res/raw/set_target_api_16.bc
similarity index 100%
rename from tests/tests/renderscript/res/raw/set_target_api_16.bc
rename to tests/tests/renderscriptlegacy/res/raw/set_target_api_16.bc
Binary files differ
diff --git a/tests/tests/renderscript/res/raw/set_target_api_17.bc b/tests/tests/renderscriptlegacy/res/raw/set_target_api_17.bc
similarity index 100%
rename from tests/tests/renderscript/res/raw/set_target_api_17.bc
rename to tests/tests/renderscriptlegacy/res/raw/set_target_api_17.bc
Binary files differ
diff --git a/tests/tests/renderscript/res/raw/set_target_api_18.bc b/tests/tests/renderscriptlegacy/res/raw/set_target_api_18.bc
similarity index 100%
rename from tests/tests/renderscript/res/raw/set_target_api_18.bc
rename to tests/tests/renderscriptlegacy/res/raw/set_target_api_18.bc
Binary files differ
diff --git a/tests/tests/renderscript/res/raw/set_target_api_19.bc b/tests/tests/renderscriptlegacy/res/raw/set_target_api_19.bc
similarity index 100%
rename from tests/tests/renderscript/res/raw/set_target_api_19.bc
rename to tests/tests/renderscriptlegacy/res/raw/set_target_api_19.bc
Binary files differ
diff --git a/tests/tests/renderscript/res/raw/set_target_api_too_high.bc b/tests/tests/renderscriptlegacy/res/raw/set_target_api_too_high.bc
similarity index 100%
rename from tests/tests/renderscript/res/raw/set_target_api_too_high.bc
rename to tests/tests/renderscriptlegacy/res/raw/set_target_api_too_high.bc
Binary files differ
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/LeakTest.java b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/LeakTest.java
similarity index 97%
rename from tests/tests/renderscript/src/android/renderscript/cts/LeakTest.java
rename to tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/LeakTest.java
index b8c133a..d6a6637 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/LeakTest.java
+++ b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/LeakTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.renderscript.cts;
+package android.renderscriptlegacy.cts;
import android.app.ActivityManager;
import android.renderscript.Allocation;
diff --git a/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/RSBase.java b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/RSBase.java
new file mode 100644
index 0000000..f6a8ab8
--- /dev/null
+++ b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/RSBase.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.renderscriptlegacy.cts;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.renderscript.RenderScript.RSErrorHandler;
+import android.renderscript.RenderScript.RSMessageHandler;
+import android.renderscript.RSRuntimeException;
+import android.test.AndroidTestCase;
+import android.util.Log;
+
+/**
+ * Base RenderScript test class. This class provides a message handler and a
+ * convenient way to wait for compute scripts to complete their execution.
+ */
+public class RSBase extends AndroidTestCase {
+
+ Context mCtx;
+ Resources mRes;
+
+ private int result;
+ private boolean msgHandled;
+
+ private static final int RS_MSG_TEST_PASSED = 100;
+ private static final int RS_MSG_TEST_FAILED = 101;
+
+ RSMessageHandler mRsMessage = new RSMessageHandler() {
+ public void run() {
+ if (result == 0) {
+ switch (mID) {
+ case RS_MSG_TEST_PASSED:
+ case RS_MSG_TEST_FAILED:
+ result = mID;
+ break;
+ default:
+ fail("Got unexpected RS message");
+ return;
+ }
+ }
+ msgHandled = true;
+ }
+ };
+
+ protected void waitForMessage() {
+ while (!msgHandled) {
+ Thread.yield();
+ }
+ }
+
+ protected boolean FoundError = false;
+ protected RSErrorHandler mRsError = new RSErrorHandler() {
+ public void run() {
+ FoundError = true;
+ Log.e("RenderscriptCTS", mErrorMessage);
+ throw new RSRuntimeException("Received error " + mErrorNum +
+ " message " + mErrorMessage);
+ }
+ };
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ result = 0;
+ msgHandled = false;
+ mCtx = getContext();
+ mRes = mCtx.getResources();
+ }
+
+ /**
+ * Verify that we didn't fail on the control or script side of things.
+ */
+ protected void checkForErrors() {
+ assertFalse(FoundError);
+ assertTrue(result != RS_MSG_TEST_FAILED);
+ }
+}
diff --git a/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/RSBaseCompute.java b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/RSBaseCompute.java
new file mode 100644
index 0000000..ac3be8a
--- /dev/null
+++ b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/RSBaseCompute.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.renderscriptlegacy.cts;
+
+import android.renderscript.RenderScript;
+import android.renderscript.Allocation;
+import android.renderscript.Element;
+import android.renderscript.RSRuntimeException;
+import android.util.Log;
+
+/**
+ * Base RenderScript test class. This class provides a message handler and a
+ * convenient way to wait for compute scripts to complete their execution.
+ */
+public class RSBaseCompute extends RSBase {
+ RenderScript mRS;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ mRS = RenderScript.create(mCtx);
+ mRS.setMessageHandler(mRsMessage);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ if (mRS != null) {
+ mRS.destroy();
+ mRS = null;
+ }
+ super.tearDown();
+ }
+}
diff --git a/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/RSUtils.java b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/RSUtils.java
new file mode 100644
index 0000000..130ef94
--- /dev/null
+++ b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/RSUtils.java
@@ -0,0 +1,223 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.renderscriptlegacy.cts;
+
+import android.content.res.Resources;
+import android.renderscript.Allocation;
+import android.renderscript.RSRuntimeException;
+
+import java.util.Random;
+
+/**
+ * This class supplies some utils for renderscript tests
+ */
+public class RSUtils {
+ private static final double[] sInterestingDoubles = {
+ 0.0,
+ 1.0,
+ Math.E,
+ Math.PI,
+ Math.PI / 2.0,
+ Math.PI * 2.0,
+ -0.0,
+ -1.0,
+ -Math.E,
+ -Math.PI,
+ -Math.PI / 2.0,
+ -Math.PI * 2.0,
+ };
+
+ /**
+ * Fills the array with random doubles. Values will be between min (inclusive) and
+ * max (inclusive).
+ */
+ public static void genRandomDoubles(long seed, double min, double max, double array[],
+ boolean includeExtremes) {
+ Random r = new Random(seed);
+ int minExponent = Math.min(Math.getExponent(min), 0);
+ int maxExponent = Math.max(Math.getExponent(max), 0);
+ if (minExponent < -6 || maxExponent > 6) {
+ // Use an exponential distribution
+ int exponentDiff = maxExponent - minExponent;
+ for (int i = 0; i < array.length; i++) {
+ double mantissa = r.nextDouble();
+ int exponent = minExponent + r.nextInt(maxExponent - minExponent);
+ int sign = (min >= 0) ? 1 : 1 - r.nextInt(2) * 2; // -1 or 1
+ double rand = sign * mantissa * Math.pow(2.0, exponent);
+ if (rand < min || rand > max) {
+ continue;
+ }
+ array[i] = rand;
+ }
+ } else {
+ // Use a linear distribution
+ for (int i = 0; i < array.length; i++) {
+ double rand = r.nextDouble();
+ array[i] = min + rand * (max - min);
+ }
+ }
+ // Seed a few special numbers we want to be sure to test.
+ for (int i = 0; i < sInterestingDoubles.length; i++) {
+ double d = sInterestingDoubles[i];
+ if (min <= d && d <= max) {
+ array[r.nextInt(array.length)] = d;
+ }
+ }
+ array[r.nextInt(array.length)] = min;
+ array[r.nextInt(array.length)] = max;
+ if (includeExtremes) {
+ array[r.nextInt(array.length)] = Double.NaN;
+ array[r.nextInt(array.length)] = Double.POSITIVE_INFINITY;
+ array[r.nextInt(array.length)] = Double.NEGATIVE_INFINITY;
+ array[r.nextInt(array.length)] = Double.MIN_VALUE;
+ array[r.nextInt(array.length)] = Double.MIN_NORMAL;
+ array[r.nextInt(array.length)] = Double.MAX_VALUE;
+ array[r.nextInt(array.length)] = -Double.MIN_VALUE;
+ array[r.nextInt(array.length)] = -Double.MIN_NORMAL;
+ array[r.nextInt(array.length)] = -Double.MAX_VALUE;
+ }
+ }
+
+ /**
+ * Fills the array with random floats. Values will be between min (inclusive) and
+ * max (inclusive).
+ */
+ public static void genRandomFloats(long seed, float min, float max, float array[],
+ boolean includeExtremes) {
+ Random r = new Random(seed);
+ int minExponent = Math.min(Math.getExponent(min), 0);
+ int maxExponent = Math.max(Math.getExponent(max), 0);
+ if (minExponent < -6 || maxExponent > 6) {
+ // Use an exponential distribution
+ int exponentDiff = maxExponent - minExponent;
+ for (int i = 0; i < array.length; i++) {
+ float mantissa = r.nextFloat();
+ int exponent = minExponent + r.nextInt(maxExponent - minExponent);
+ int sign = (min >= 0) ? 1 : 1 - r.nextInt(2) * 2; // -1 or 1
+ float rand = sign * mantissa * (float) Math.pow(2.0, exponent);
+ if (rand < min || rand > max) {
+ continue;
+ }
+ array[i] = rand;
+ }
+ } else {
+ // Use a linear distribution
+ for (int i = 0; i < array.length; i++) {
+ float rand = r.nextFloat();
+ array[i] = min + rand * (max - min);
+ }
+ }
+ // Seed a few special numbers we want to be sure to test.
+ for (int i = 0; i < sInterestingDoubles.length; i++) {
+ float f = (float) sInterestingDoubles[i];
+ if (min <= f && f <= max) {
+ array[r.nextInt(array.length)] = f;
+ }
+ }
+ array[r.nextInt(array.length)] = min;
+ array[r.nextInt(array.length)] = max;
+ if (includeExtremes) {
+ array[r.nextInt(array.length)] = Float.NaN;
+ array[r.nextInt(array.length)] = Float.POSITIVE_INFINITY;
+ array[r.nextInt(array.length)] = Float.NEGATIVE_INFINITY;
+ array[r.nextInt(array.length)] = Float.MIN_VALUE;
+ array[r.nextInt(array.length)] = Float.MIN_NORMAL;
+ array[r.nextInt(array.length)] = Float.MAX_VALUE;
+ array[r.nextInt(array.length)] = -Float.MIN_VALUE;
+ array[r.nextInt(array.length)] = -Float.MIN_NORMAL;
+ array[r.nextInt(array.length)] = -Float.MAX_VALUE;
+ }
+ }
+
+ /**
+ * Fills the array with random ints. Values will be between min (inclusive) and
+ * max (inclusive).
+ */
+ public static void genRandomInts(long seed, int min, int max, int array[]) {
+ Random r = new Random(seed);
+ for (int i = 0; i < array.length; i++) {
+ long range = max - min + 1;
+ array[i] = (int) (min + r.nextLong() % range);
+ }
+ array[r.nextInt(array.length)] = min;
+ array[r.nextInt(array.length)] = max;
+ }
+
+ /**
+ * Fills the array with random longs. If signed is true, negative values can be generated.
+ * The values will fit within 'numberOfBits'. This is useful for conversion tests.
+ */
+ public static void genRandomLongs(long seed, long array[], boolean signed, int numberOfBits) {
+ long positiveMask = numberOfBits == 64 ? -1 : ((1l << numberOfBits) - 1);
+ long negativeMask = ~positiveMask;
+ Random r = new Random(seed);
+ for (int i = 0; i < array.length; i++) {
+ long l = r.nextLong();
+ if (signed && l < 0) {
+ l = l | negativeMask;
+ } else {
+ l = l & positiveMask;
+ }
+ array[i] = l;
+ }
+ // Seed a few special numbers we want to be sure to test.
+ array[r.nextInt(array.length)] = 0l;
+ array[r.nextInt(array.length)] = 1l;
+ array[r.nextInt(array.length)] = positiveMask;
+ if (signed) {
+ array[r.nextInt(array.length)] = negativeMask;
+ array[r.nextInt(array.length)] = -1;
+ }
+ }
+
+ public static void genRandomInts(long seed, int array[], boolean signed, int numberOfBits) {
+ long[] longs = new long[array.length];
+ genRandomLongs(seed, longs, signed, numberOfBits);
+ for (int i = 0; i < array.length; i++) {
+ array[i] = (int) longs[i];
+ }
+ }
+
+ public static void genRandomShorts(long seed, short array[], boolean signed, int numberOfBits) {
+ long[] longs = new long[array.length];
+ genRandomLongs(seed, longs, signed, numberOfBits);
+ for (int i = 0; i < array.length; i++) {
+ array[i] = (short) longs[i];
+ }
+ }
+
+ public static void genRandomBytes(long seed, byte array[], boolean signed, int numberOfBits) {
+ long[] longs = new long[array.length];
+ genRandomLongs(seed, longs, signed, numberOfBits);
+ for (int i = 0; i < array.length; i++) {
+ array[i] = (byte) longs[i];
+ }
+ }
+
+ // Compares two unsigned long. Returns < 0 if a < b, 0 if a == b, > 0 if a > b.
+ public static long compareUnsignedLong(long a, long b) {
+ long aFirstFourBits = a >>> 60;
+ long bFirstFourBits = b >>> 60;
+ long firstFourBitsDiff = aFirstFourBits - bFirstFourBits;
+ if (firstFourBitsDiff != 0) {
+ return firstFourBitsDiff;
+ }
+ long aRest = a & 0x0fffffffffffffffl;
+ long bRest = b & 0x0fffffffffffffffl;
+ return aRest - bRest;
+ }
+}
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_leak.java b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_leak.java
similarity index 97%
rename from tests/tests/renderscript/src/android/renderscript/cts/ScriptC_leak.java
rename to tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_leak.java
index c026755..7d6aa8b 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_leak.java
+++ b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_leak.java
@@ -18,7 +18,7 @@
* This file is auto-generated. DO NOT MODIFY!
* The source Renderscript file: leak.rs
*/
-package android.renderscript.cts;
+package android.renderscriptlegacy.cts;
import android.renderscript.*;
import android.content.res.Resources;
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_11.java b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_11.java
similarity index 97%
rename from tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_11.java
rename to tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_11.java
index e4ba592..eafc858 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_11.java
+++ b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_11.java
@@ -18,7 +18,7 @@
* This file is auto-generated. DO NOT MODIFY!
* The source Renderscript file: set_target_api_11.rs
*/
-package android.renderscript.cts;
+package android.renderscriptlegacy.cts;
import android.renderscript.*;
import android.content.res.Resources;
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_12.java b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_12.java
similarity index 97%
rename from tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_12.java
rename to tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_12.java
index c0e6c71..83db0ab 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_12.java
+++ b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_12.java
@@ -18,7 +18,7 @@
* This file is auto-generated. DO NOT MODIFY!
* The source Renderscript file: set_target_api_12.rs
*/
-package android.renderscript.cts;
+package android.renderscriptlegacy.cts;
import android.renderscript.*;
import android.content.res.Resources;
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_13.java b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_13.java
similarity index 97%
rename from tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_13.java
rename to tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_13.java
index 0c0eacc..a62cb1a 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_13.java
+++ b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_13.java
@@ -18,7 +18,7 @@
* This file is auto-generated. DO NOT MODIFY!
* The source Renderscript file: set_target_api_13.rs
*/
-package android.renderscript.cts;
+package android.renderscriptlegacy.cts;
import android.renderscript.*;
import android.content.res.Resources;
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_14.java b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_14.java
similarity index 97%
rename from tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_14.java
rename to tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_14.java
index d618472..ab5abab 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_14.java
+++ b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_14.java
@@ -18,7 +18,7 @@
* This file is auto-generated. DO NOT MODIFY!
* The source Renderscript file: set_target_api_14.rs
*/
-package android.renderscript.cts;
+package android.renderscriptlegacy.cts;
import android.renderscript.*;
import android.content.res.Resources;
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_15.java b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_15.java
similarity index 97%
rename from tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_15.java
rename to tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_15.java
index a031b1c..97a347f 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_15.java
+++ b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_15.java
@@ -18,7 +18,7 @@
* This file is auto-generated. DO NOT MODIFY!
* The source Renderscript file: set_target_api_15.rs
*/
-package android.renderscript.cts;
+package android.renderscriptlegacy.cts;
import android.renderscript.*;
import android.content.res.Resources;
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_16.java b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_16.java
similarity index 97%
rename from tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_16.java
rename to tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_16.java
index bc48c48..d8f8a2f 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_16.java
+++ b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_16.java
@@ -18,7 +18,7 @@
* This file is auto-generated. DO NOT MODIFY!
* The source Renderscript file: set_target_api_16.rs
*/
-package android.renderscript.cts;
+package android.renderscriptlegacy.cts;
import android.renderscript.*;
import android.content.res.Resources;
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_17.java b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_17.java
similarity index 97%
rename from tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_17.java
rename to tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_17.java
index 176c8e3..90b4109 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_17.java
+++ b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_17.java
@@ -18,7 +18,7 @@
* This file is auto-generated. DO NOT MODIFY!
* The source Renderscript file: set_target_api_17.rs
*/
-package android.renderscript.cts;
+package android.renderscriptlegacy.cts;
import android.renderscript.*;
import android.content.res.Resources;
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_18.java b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_18.java
similarity index 97%
rename from tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_18.java
rename to tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_18.java
index a0ab5ad..eb6c04d 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_18.java
+++ b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_18.java
@@ -18,7 +18,7 @@
* This file is auto-generated. DO NOT MODIFY!
* The source Renderscript file: set_target_api_18.rs
*/
-package android.renderscript.cts;
+package android.renderscriptlegacy.cts;
import android.renderscript.*;
import android.content.res.Resources;
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_19.java b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_19.java
similarity index 97%
rename from tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_19.java
rename to tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_19.java
index c5017a2..530930e 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_19.java
+++ b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_19.java
@@ -18,7 +18,7 @@
* This file is auto-generated. DO NOT MODIFY!
* The source Renderscript file: set_target_api_19.rs
*/
-package android.renderscript.cts;
+package android.renderscriptlegacy.cts;
import android.renderscript.*;
import android.content.res.Resources;
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_too_high.java b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_too_high.java
similarity index 97%
rename from tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_too_high.java
rename to tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_too_high.java
index f54ab46..84f02ec 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ScriptC_set_target_api_too_high.java
+++ b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/ScriptC_set_target_api_too_high.java
@@ -18,7 +18,7 @@
* This file is auto-generated. DO NOT MODIFY!
* The source Renderscript file: set_target_api_16.rs
*/
-package android.renderscript.cts;
+package android.renderscriptlegacy.cts;
import android.renderscript.*;
import android.content.res.Resources;
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/VersionTest.java b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/VersionTest.java
similarity index 98%
rename from tests/tests/renderscript/src/android/renderscript/cts/VersionTest.java
rename to tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/VersionTest.java
index f167a86..c33edbc 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/VersionTest.java
+++ b/tests/tests/renderscriptlegacy/src/android/renderscriptlegacy/cts/VersionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.renderscript.cts;
+package android.renderscriptlegacy.cts;
import android.renderscript.RenderScript.RSMessageHandler;
import android.renderscript.RSRuntimeException;