commit d19babd46408f143f2d5d6478ebd90c48db8d6ec
author Yang Ni <yangni@google.com> Fri May 06 18:00:41 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri May 06 18:00:41 2016 +0000
tree 247a6042b9e60c34d8ad761672b6cdd2452fd415
parent ba6c2214970297b5af9bde22dd17d035a7c643e8
parent 56ecb64783b2637a0ff907c9459a7271881e5963

Merge "Avoid breaking on dead launch options" into nyc-dev
am: 56ecb64783

* commit '56ecb64783b2637a0ff907c9459a7271881e5963':
  Avoid breaking on dead launch options

Change-Id: Id2f2240d90a57cd20e4c4b4532624b6697306d38

cpu_ref/rsCpuScript.cpp

diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp
index a88af2f..0400fab 100644
--- a/cpu_ref/rsCpuScript.cpp
+++ b/cpu_ref/rsCpuScript.cpp
@@ -548,10 +548,8 @@
     SET_UP_DIMENSION(x, x);
     SET_UP_DIMENSION(y, y);
     SET_UP_DIMENSION(z, z);
-    SET_UP_DIMENSION(array[0], array);
-    SET_UP_DIMENSION(array[1], array2);
-    SET_UP_DIMENSION(array[2], array3);
-    SET_UP_DIMENSION(array[3], array4);
+    // Checks and setup of fields other than x, y, z are ignored, since those
+    // fields are not used in the runtime and are not visible in the Java API.
 #undef SET_UP_DIMENSION
 
     return true;