Merge "Test HIDL topological reordering" am: 0495818b3b am: 41953e0c17 am: 681a5b4855
am: 69e876fe42
Change-Id: If202932e68647f798e2b46c698237cee73b797e3
diff --git a/tests/trie/1.0/types.hal b/tests/trie/1.0/types.hal
index 28c502b..c626909 100644
--- a/tests/trie/1.0/types.hal
+++ b/tests/trie/1.0/types.hal
@@ -16,16 +16,16 @@
package android.hardware.tests.trie@1.0;
+struct TrieEdge {
+ int8_t character;
+ TrieNode node; // Requires reordering.
+};
+
struct TrieNode {
vec<TrieEdge> next;
bool isTerminal;
};
-struct TrieEdge {
- int8_t character;
- TrieNode node;
-};
-
// Some forward reference tests.
struct A {
@@ -41,11 +41,11 @@
refS f;
};
+enum E2 : E1 {
+ ACCEPT,
+};
+
enum E1 : int32_t {
OK = E2:ACCEPT + ANOTHER,
ANOTHER = 100,
};
-
-enum E2 : E1 {
- ACCEPT,
-};