commit c54d32cb0b20308a0ecea7864016a2a5dc512f71
author Yifan Hong <elsk@google.com> Tue Mar 07 19:12:26 2017 -0800
committer Yifan Hong <elsk@google.com> Wed Mar 08 14:13:10 2017 -0800
tree 2ed2bcbc1c5896c5d341487bab0cb33f1a498962
parent 037f12a8b5cabf45a8f69f41e886f017b33ce21e

Add bitness info to <transport>.

Only valid for transport == passthrough or toggled.
Example:
<transport>hwbinder</transport>
<transport arch="64">passthrough</transport>
<transport arch="32+64">passthrough</transport>
<transport arch="32">passthrough</transport>

Allow transport tag to be missing (for native HALs like GLES).

Bug: 35966597
Test: libvintf_test
Change-Id: I80928a5d46f3097ed18f2894e46762127b29bd4c

test/main.cpp

diff --git a/test/main.cpp b/test/main.cpp
index 28ef4c9..89eac7b 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -74,7 +74,7 @@
             .name = "android.hardware.camera",
             .versions = {Version(2, 0)},
             .impl = HalImplementation{ImplLevel::SOC, "msm8892"},
-            .transport = Transport::HWBINDER,
+            .transportArch = {Transport::HWBINDER, Arch::ARCH_EMPTY},
             .interfaces = {
                 {"ICamera", {"ICamera", {"legacy/0", "default"}}},
                 {"IBetterCamera", {"IBetterCamera", {"camera"}}}
@@ -85,7 +85,7 @@
             .name = "android.hardware.nfc",
             .versions = {Version(1, 0)},
             .impl = HalImplementation{ImplLevel::GENERIC, "generic"},
-            .transport = Transport::PASSTHROUGH,
+            .transportArch = {Transport::PASSTHROUGH, Arch::ARCH_32_64},
             .interfaces = {
                 {"INfc", {"INfc", {"default"}}}
             }
@@ -117,7 +117,7 @@
 TEST_F(LibVintfTest, Stringify) {
     HalManifest vm = testHalManifest();
     EXPECT_EQ(dump(vm), "hidl/android.hardware.camera/hwbinder/soc/msm8892/2.0:"
-                        "hidl/android.hardware.nfc/passthrough/generic/generic/1.0");
+                        "hidl/android.hardware.nfc/passthrough32+64/generic/generic/1.0");
 
     EXPECT_EQ(to_string(HalFormat::HIDL), "hidl");
     EXPECT_EQ(to_string(HalFormat::NATIVE), "native");
@@ -151,7 +151,7 @@
         "    </hal>\n"
         "    <hal format=\"hidl\">\n"
         "        <name>android.hardware.nfc</name>\n"
-        "        <transport>passthrough</transport>\n"
+        "        <transport arch=\"32+64\">passthrough</transport>\n"
         "        <impl level=\"generic\">generic</impl>\n"
         "        <version>1.0</version>\n"
         "        <interface>\n"
@@ -168,7 +168,7 @@
             .format = HalFormat::HIDL,
             .name = "android.hidl.manager",
             .impl = HalImplementation{},
-            .transport = Transport::HWBINDER,
+            .transportArch = {Transport::HWBINDER, Arch::ARCH_EMPTY},
         }),
         "<hal format=\"hidl\">\n"
         "    <name>android.hidl.manager</name>\n"
@@ -404,7 +404,7 @@
         .name = "android.hardware.camera",
         .versions = {{Version(2, 0), Version(2, 1)}},
         .impl = HalImplementation{ImplLevel::SOC, "msm8892"},
-        .transport = Transport::PASSTHROUGH
+        .transportArch = {Transport::PASSTHROUGH, Arch::ARCH_32_64}
     };
 
     EXPECT_FALSE(isValid(invalidHal));