commit a9b21d0018f385cd9d9fd41636085a881f7393b0
author Zhuoyao Zhang <zhuoyao@google.com> Thu Oct 27 01:26:27 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 27 01:26:28 2016 +0000
tree 9d926eb5aaa72ea05025aa8c49a02afb1686de36
parent 10fe0b55e774903fe37b658458053527da8b5a53
parent eb355ee0b307d651497f606271a15fbb3dcd2e47

Merge "Update hidl-gen to support generating vts files for multi-dimentional array."

ArrayType.cpp

diff --git a/ArrayType.cpp b/ArrayType.cpp
index ec91531..268b090 100644
--- a/ArrayType.cpp
+++ b/ArrayType.cpp
@@ -481,21 +481,34 @@
 }
 
 status_t ArrayType::emitVtsTypeDeclarations(Formatter &out) const {
-    if (mSizes.size() > 1) {
-        CHECK(!"Multi-dimensional arrays are yet to be supported in VTS.");
-        return UNKNOWN_ERROR;
-    }
-
     out << "type: " << getVtsType() << "\n";
     out << "vector_value: {\n";
     out.indent();
     out << "vector_size: " << mSizes[0] << "\n";
-    status_t err = mElementType->emitVtsTypeDeclarations(out);
-    if (err != OK) {
-        return err;
+    // Simple array case.
+    if (mSizes.size() == 1) {
+        status_t err = mElementType->emitVtsTypeDeclarations(out);
+        if (err != OK) {
+            return err;
+        }
+    } else {  // Multi-dimension array case.
+        for (size_t index = 1; index < mSizes.size(); index++) {
+            out << "type: " << getVtsType() << "\n";
+            out << "vector_value: {\n";
+            out.indent();
+            out << "vector_size: " << mSizes[index] << "\n";
+            if (index == mSizes.size() - 1) {
+                status_t err = mElementType->emitVtsTypeDeclarations(out);
+                if (err != OK) {
+                    return err;
+                }
+            }
+        }
     }
-    out.unindent();
-    out << "}\n";
+    for (size_t index = 0; index < mSizes.size(); index++) {
+        out.unindent();
+        out << "}\n";
+    }
     return OK;
 }