commit 709b62dbda6184770bb34470ff550e02c1643e67
author Andreas Huber <andih@google.com> Mon Sep 19 11:21:18 2016 -0700
committer Andreas Huber <andih@google.com> Mon Sep 19 14:09:41 2016 -0700
tree 737c1b74e78654e529e21733187384bd5e252fe5
parent 5ed04fe8e60776d6df2d2a51398b5e9a878e8ebc

Arrays of arrays are now coalesced into a single multi-dimensional array type.

This is natively stored as a flat array of the element type.

Change-Id: I1b0eee51b496648a9c8445b835635deff1a90aab
Bug: 31438033
Test: run updated "hidl_test" and "hidl_test_java"

hidl-gen_y.yy

diff --git a/hidl-gen_y.yy b/hidl-gen_y.yy
index 9ced71f..6249886 100644
--- a/hidl-gen_y.yy
+++ b/hidl-gen_y.yy
@@ -29,6 +29,7 @@
 
 #include "hidl-gen_y.h"
 
+#include <android-base/logging.h>
 #include <stdio.h>
 
 using namespace android;
@@ -600,7 +601,15 @@
               YYERROR;
           }
 
-          $$ = new ArrayType($1, $3);
+          char *end;
+          unsigned long size = strtoul($3, &end, 10);
+          CHECK(end > $3 && *end == '\0');
+
+          if ($1->isArray()) {
+              $$ = new ArrayType(static_cast<ArrayType *>($1), size);
+          } else {
+              $$ = new ArrayType($1, size);
+          }
       }
     | VEC '<' fqname '>'
       {