127 files changed, 6 insertions, 6 deletions
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/UT_script_group2_gatherscatter.java b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/UT_script_group2_gatherscatter.java
index 567afbe6..69e9e021 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/UT_script_group2_gatherscatter.java
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/UT_script_group2_gatherscatter.java
@@ -48,7 +48,7 @@ public class UT_script_group2_gatherscatter extends UnitTest {
     // on global allocations that are passed across kernels in a script group.
     // The test sums up all elements in the input int4 array of size ARRAY_SIZE.
     // To do so, it adds up the second half of the array to its first half using
-    // kernel function add() in addsup.rs, and then repeatedly applies the same
+    // kernel function add() in addsup.rscript, and then repeatedly applies the same
     // kernel function to the shrinking result arrays until the result is a
     // single int4 value.
     // These steps are created as a script group by repeatedly adding the
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/addup.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/addup.rscript
index 4f48798a..4f48798a 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/addup.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/addup.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/alloc.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/alloc.rscript
index bf271d59..bf271d59 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/alloc.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/alloc.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/array_alloc.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/array_alloc.rscript
index 79ede39f..79ede39f 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/array_alloc.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/array_alloc.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/array_init.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/array_init.rscript
index 03e27871..03e27871 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/array_init.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/array_init.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/atomic.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/atomic.rscript
index b81669d1..b81669d1 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/atomic.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/atomic.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/bitfield.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/bitfield.rscript
index fe221389..fe221389 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/bitfield.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/bitfield.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/bug_char.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/bug_char.rscript
index 8e11d895..8e11d895 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/bug_char.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/bug_char.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/check_dims.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/check_dims.rscript
index 57c14b24..57c14b24 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/check_dims.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/check_dims.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/clamp.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/clamp.rscript
index 6de80c98..6de80c98 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/clamp.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/clamp.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/convert_relaxed.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/clamp_relaxed.rscript
index 93fd7cb4..b828ae0d 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/convert_relaxed.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/clamp_relaxed.rscript
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-#include "convert.rs"
+#include "clamp.rscript"
 #pragma rs_fp_relaxed
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/constant.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/constant.rscript
index aad61e98..aad61e98 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/constant.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/constant.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/convert.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/convert.rscript
index a9eb16dd..a9eb16dd 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/convert.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/convert.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/clamp_relaxed.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/convert_relaxed.rscript
index 9cc597f7..915143ac 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/clamp_relaxed.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/convert_relaxed.rscript
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-#include "clamp.rs"
+#include "convert.rscript"
 #pragma rs_fp_relaxed
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/copy_test.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/copy_test.rscript
index 34fd01b0..34fd01b0 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/copy_test.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/copy_test.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/ctxt_default.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/ctxt_default.rscript
index cae6fb72..cae6fb72 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/ctxt_default.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/ctxt_default.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/double.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/double.rscript
index dc5f4d55..dc5f4d55 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/double.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/double.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/element.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/element.rscript
index 9dceea4c..9dceea4c 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/element.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/element.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/float_test.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/float_test.rscript
index 46e8ef66..46e8ef66 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/float_test.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/float_test.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach.rscript
index ed53cd70..ed53cd70 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach_bounds.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach_bounds.rscript
index 854df668..854df668 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach_bounds.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach_bounds.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach_multi.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach_multi.rscript
index 86603e4f..86603e4f 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach_multi.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/foreach_multi.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp16.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp16.rscript
index 0e01b9aa..0e01b9aa 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp16.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp16.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp16_globals.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp16_globals.rscript
index fd8906f6..fd8906f6 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp16_globals.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp16_globals.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp_mad.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp_mad.rscript
index 9ba1f923..9ba1f923 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp_mad.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/fp_mad.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/increment.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/increment.rscript
index 3fc2c5a5..3fc2c5a5 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/increment.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/increment.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/increment2.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/increment2.rscript
index a0de51c6..a0de51c6 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/increment2.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/increment2.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/instance.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/instance.rscript
index 3c3208c4..3c3208c4 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/instance.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/instance.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/int4.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/int4.rscript
index fac0619b..fac0619b 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/int4.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/int4.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel.rscript
index dd6a2e67..dd6a2e67 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel2d.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel2d.rscript
index 69e95c85..69e95c85 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel2d.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel2d.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel2d_oldstyle.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel2d_oldstyle.rscript
index 7d76c9ae..7d76c9ae 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel2d_oldstyle.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel2d_oldstyle.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel3d.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel3d.rscript
index 1771a7c8..1771a7c8 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel3d.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel3d.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel_struct.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel_struct.rscript
index f54fe6d7..f54fe6d7 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel_struct.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/kernel_struct.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math.rscript
index 2e534810..2e534810 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_24.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_24.rscript
index bc0ed54c..bc0ed54c 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_24.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_24.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_agree.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_agree.rscript
index 6d8fd5c2..6d8fd5c2 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_agree.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_agree.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_conformance.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_conformance.rscript
index 402bbfed..402bbfed 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_conformance.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_conformance.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_fp16.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_fp16.rscript
index 04cd8d0b..04cd8d0b 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_fp16.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/math_fp16.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/min.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/min.rscript
index 5833a295..5833a295 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/min.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/min.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/noroot.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/noroot.rscript
index d850c86b..d850c86b 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/noroot.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/noroot.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/primitives.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/primitives.rscript
index 290a28d4..290a28d4 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/primitives.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/primitives.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reduce.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reduce.rscript
index cff0b854..cff0b854 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reduce.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reduce.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reduce_backward.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reduce_backward.rscript
index ab4ff330..ab4ff330 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reduce_backward.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reduce_backward.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/refcount.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/refcount.rscript
index 805ba6ca..805ba6ca 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/refcount.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/refcount.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reflection3264.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reflection3264.rscript
index 159b3184..159b3184 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reflection3264.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/reflection3264.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug.rscript
index 046650e6..046650e6 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug_23.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug_23.rscript
index 7fbd4db6..7fbd4db6 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug_23.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug_23.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug_24.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug_24.rscript
index 08a1a42c..08a1a42c 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug_24.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rsdebug_24.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rstime.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rstime.rscript
index a47df28b..a47df28b 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rstime.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rstime.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rstypes.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rstypes.rscript
index d53538c2..d53538c2 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rstypes.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/rstypes.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/sampler.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/sampler.rscript
index 89aa2100..89aa2100 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/sampler.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/sampler.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_alloc.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_alloc.rscript
index b4d19126..b4d19126 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_alloc.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_alloc.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_ref_count.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_ref_count.rscript
index 20d6e9a1..20d6e9a1 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_ref_count.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_ref_count.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_script.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_script.rscript
index 773bb634..773bb634 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_script.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/single_source_script.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/small_struct.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/small_struct.rscript
index 7841573e..7841573e 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/small_struct.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/small_struct.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/small_struct_2.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/small_struct_2.rscript
index da6b7ff3..da6b7ff3 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/small_struct_2.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/small_struct_2.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/static_globals.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/static_globals.rscript
index 303bf999..303bf999 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/static_globals.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/static_globals.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct.rscript
index 06f1f2ed..06f1f2ed 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct_field.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct_field.rscript
index 755a7174..755a7174 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct_field.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct_field.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct_field_simple.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct_field_simple.rscript
index 5ec4591e..5ec4591e 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct_field_simple.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/struct_field_simple.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/unsigned.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/unsigned.rscript
index 53e58e07..53e58e07 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/unsigned.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/unsigned.rscript
diff --git a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/vector.rs b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/vector.rscript
index c81f270b..c81f270b 100644
--- a/tests/java_api/RSUnitTests/src/com/android/rs/unittest/vector.rs
+++ b/tests/java_api/RSUnitTests/src/com/android/rs/unittest/vector.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibonlysrc/com/android/rs/unittest/alloc_supportlib.rs b/tests/java_api/RSUnitTests/supportlibonlysrc/com/android/rs/unittest/alloc_supportlib.rscript
index 26497798..26497798 100644
--- a/tests/java_api/RSUnitTests/supportlibonlysrc/com/android/rs/unittest/alloc_supportlib.rs
+++ b/tests/java_api/RSUnitTests/supportlibonlysrc/com/android/rs/unittest/alloc_supportlib.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibonlysrc/com/android/rs/unittest/apitest.rs b/tests/java_api/RSUnitTests/supportlibonlysrc/com/android/rs/unittest/apitest.rscript
index b0829a38..b0829a38 100644
--- a/tests/java_api/RSUnitTests/supportlibonlysrc/com/android/rs/unittest/apitest.rs
+++ b/tests/java_api/RSUnitTests/supportlibonlysrc/com/android/rs/unittest/apitest.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/UT_script_group2_gatherscatter.java b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/UT_script_group2_gatherscatter.java
index 9146872a..8d8605da 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/UT_script_group2_gatherscatter.java
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/UT_script_group2_gatherscatter.java
@@ -50,7 +50,7 @@ public class UT_script_group2_gatherscatter extends UnitTest {
     // on global allocations that are passed across kernels in a script group.
     // The test sums up all elements in the input int4 array of size ARRAY_SIZE.
     // To do so, it adds up the second half of the array to its first half using
-    // kernel function add() in addsup.rs, and then repeatedly applies the same
+    // kernel function add() in addsup.rscript, and then repeatedly applies the same
     // kernel function to the shrinking result arrays until the result is a
     // single int4 value.
     // These steps are created as a script group by repeatedly adding the
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/addup.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/addup.rscript
index 209a6232..209a6232 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/addup.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/addup.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/alloc.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/alloc.rscript
index 5ebeef08..5ebeef08 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/alloc.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/alloc.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/alloc_supportlib.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/alloc_supportlib.rscript
index e3f75527..e3f75527 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/alloc_supportlib.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/alloc_supportlib.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/apitest.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/apitest.rscript
index 28f6c8f9..28f6c8f9 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/apitest.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/apitest.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/array_alloc.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/array_alloc.rscript
index 15c6c03a..15c6c03a 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/array_alloc.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/array_alloc.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/array_init.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/array_init.rscript
index 9e266635..9e266635 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/array_init.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/array_init.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/atomic.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/atomic.rscript
index 21fa5f2f..21fa5f2f 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/atomic.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/atomic.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/bitfield.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/bitfield.rscript
index e6cea9f0..e6cea9f0 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/bitfield.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/bitfield.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/bug_char.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/bug_char.rscript
index e9b450c9..e9b450c9 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/bug_char.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/bug_char.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/check_dims.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/check_dims.rscript
index 8af7fd07..8af7fd07 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/check_dims.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/check_dims.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/clamp.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/clamp.rscript
index b0c072e3..b0c072e3 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/clamp.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/clamp.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/clamp_relaxed.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/clamp_relaxed.rscript
index f391d62b..72ae631d 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/clamp_relaxed.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/clamp_relaxed.rscript
@@ -16,5 +16,5 @@
  * limitations under the License.
  */
 
-#include "clamp.rs"
+#include "clamp.rscript"
 #pragma rs_fp_relaxed
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/constant.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/constant.rscript
index 8333327d..8333327d 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/constant.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/constant.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/convert.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/convert.rscript
index 136bbcf1..136bbcf1 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/convert.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/convert.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/convert_relaxed.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/convert_relaxed.rscript
index 05de3c3f..48b61c4d 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/convert_relaxed.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/convert_relaxed.rscript
@@ -16,5 +16,5 @@
  * limitations under the License.
  */
 
-#include "convert.rs"
+#include "convert.rscript"
 #pragma rs_fp_relaxed
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/copy_test.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/copy_test.rscript
index 419d5503..419d5503 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/copy_test.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/copy_test.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/ctxt_default.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/ctxt_default.rscript
index 324d8f9d..324d8f9d 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/ctxt_default.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/ctxt_default.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/double.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/double.rscript
index fcef0982..fcef0982 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/double.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/double.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/element.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/element.rscript
index 355c9279..355c9279 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/element.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/element.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/float_test.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/float_test.rscript
index adceb864..adceb864 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/float_test.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/float_test.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach.rscript
index e3174451..e3174451 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach_bounds.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach_bounds.rscript
index a1b65b17..a1b65b17 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach_bounds.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach_bounds.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach_multi.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach_multi.rscript
index 33501e2e..33501e2e 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach_multi.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/foreach_multi.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/fp_mad.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/fp_mad.rscript
index d2ca9f37..d2ca9f37 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/fp_mad.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/fp_mad.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/increment.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/increment.rscript
index 0cfc328b..0cfc328b 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/increment.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/increment.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/increment2.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/increment2.rscript
index b314a150..b314a150 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/increment2.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/increment2.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/instance.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/instance.rscript
index 548fdc1b..548fdc1b 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/instance.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/instance.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/int4.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/int4.rscript
index 5c97ca66..5c97ca66 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/int4.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/int4.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel.rscript
index df860640..df860640 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel2d.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel2d.rscript
index f6623919..f6623919 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel2d.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel2d.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel2d_oldstyle.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel2d_oldstyle.rscript
index 7a93b2e5..7a93b2e5 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel2d_oldstyle.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel2d_oldstyle.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel3d.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel3d.rscript
index 2761f069..2761f069 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel3d.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel3d.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel_struct.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel_struct.rscript
index d8ec9b5f..d8ec9b5f 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel_struct.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/kernel_struct.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math.rscript
index 895ddc65..895ddc65 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_24.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_24.rscript
index e5a45674..e5a45674 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_24.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_24.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_agree.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_agree.rscript
index b02c38c5..b02c38c5 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_agree.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_agree.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_conformance.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_conformance.rscript
index 81fe1fe9..81fe1fe9 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_conformance.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/math_conformance.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/min.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/min.rscript
index 7dbb1d4e..7dbb1d4e 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/min.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/min.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/noroot.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/noroot.rscript
index 07387804..07387804 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/noroot.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/noroot.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/primitives.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/primitives.rscript
index 6dc77c24..6dc77c24 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/primitives.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/primitives.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reduce.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reduce.rscript
index eaeeb639..eaeeb639 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reduce.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reduce.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reduce_backward.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reduce_backward.rscript
index 5442851a..5442851a 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reduce_backward.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reduce_backward.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/refcount.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/refcount.rscript
index 497a886a..497a886a 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/refcount.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/refcount.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reflection3264.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reflection3264.rscript
index e6959e59..e6959e59 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reflection3264.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/reflection3264.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug.rscript
index 7225b435..7225b435 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug_23.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug_23.rscript
index a6e9453b..a6e9453b 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug_23.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug_23.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug_24.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug_24.rscript
index 9e6e72f3..9e6e72f3 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug_24.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rsdebug_24.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rstime.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rstime.rscript
index 40040fa6..40040fa6 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rstime.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rstime.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rstypes.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rstypes.rscript
index 1e62192d..1e62192d 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rstypes.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/rstypes.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/sampler.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/sampler.rscript
index d2411cf5..d2411cf5 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/sampler.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/sampler.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_alloc.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_alloc.rscript
index 69b0e75f..69b0e75f 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_alloc.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_alloc.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_ref_count.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_ref_count.rscript
index 09fa035c..09fa035c 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_ref_count.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_ref_count.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_script.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_script.rscript
index 593fd91c..593fd91c 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_script.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/single_source_script.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/small_struct.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/small_struct.rscript
index 3c57acd6..3c57acd6 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/small_struct.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/small_struct.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/small_struct_2.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/small_struct_2.rscript
index 0e4966a5..0e4966a5 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/small_struct_2.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/small_struct_2.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/static_globals.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/static_globals.rscript
index b537efff..b537efff 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/static_globals.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/static_globals.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct.rscript
index 3f1730d9..3f1730d9 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct_field.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct_field.rscript
index 0d345fa6..0d345fa6 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct_field.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct_field.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct_field_simple.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct_field_simple.rscript
index 7995b9d1..7995b9d1 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct_field_simple.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/struct_field_simple.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/unsigned.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/unsigned.rscript
index 10702360..10702360 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/unsigned.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/unsigned.rscript
diff --git a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/vector.rs b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/vector.rscript
index 5e54043b..5e54043b 100644
--- a/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/vector.rs
+++ b/tests/java_api/RSUnitTests/supportlibsrc_gen/com/android/rs/unittest/vector.rscript