Merge "Fix a typo that was causing two index values to be commented out."
diff --git a/graphics/mapper/2.0/vts/functional/Android.bp b/graphics/mapper/2.0/vts/functional/Android.bp
index 53e6d16..27ea350 100644
--- a/graphics/mapper/2.0/vts/functional/Android.bp
+++ b/graphics/mapper/2.0/vts/functional/Android.bp
@@ -30,6 +30,7 @@
"libutils",
"android.hardware.graphics.allocator@2.0",
"android.hardware.graphics.mapper@2.0",
+ "android.hardware.graphics.common@1.0",
],
static_libs: ["libgtest"],
cflags: [
diff --git a/tests/foo/1.0/IFoo.hal b/tests/foo/1.0/IFoo.hal
index fc76c1c..76aefcf 100644
--- a/tests/foo/1.0/IFoo.hal
+++ b/tests/foo/1.0/IFoo.hal
@@ -98,6 +98,29 @@
typedef bitfield<BitField> Mask;
+ struct Everything {
+ union U {
+ int8_t number;
+ int8_t[1][2] multidimArray;
+ pointer p;
+ Fumble anotherStruct;
+ bitfield<BitField> bf;
+ } u;
+
+ int8_t number;
+ handle h;
+ fmq_sync<uint8_t> descSync;
+ fmq_unsync<uint8_t> descUnsync;
+ memory mem;
+ pointer p;
+ string s;
+ vec<string> vs;
+ string[2][2] multidimArray;
+ string[3] sArray;
+ Quux anotherStruct;
+ bitfield<BitField> bf;
+ };
+
doThis(float param);
doThatAndReturnSomething(int64_t param) generates (int32_t result);
doQuiteABit(int32_t a, int64_t b, float c, double d) generates (double something);