commit e0bb98d008f2cbc19bf356a74c086bed4867ea99
author Yifan Hong <elsk@google.com> Mon Aug 07 14:40:19 2017 -0700
committer Yifan Hong <elsk@google.com> Mon Aug 07 15:24:08 2017 -0700
tree 69a749c644ea0b6de7bb72aaad5055729c1c4404
parent 488e16a67311194f0fb9aa4a33219af170e6316b

Native HALs don't require <transport>.

This is stated in go/android-treble-vintf-object but the code
was not well tested. Fortunately, native HALs are not used (until now),
so we need to conform to the documentation here.

Test: libvintf_test
Bug: 64447338
Change-Id: I00d96137d4052d9da50f696ef665a73d09d818a7
Merged-In: I00d96137d4052d9da50f696ef665a73d09d818a7

parse_xml.cpp

diff --git a/parse_xml.cpp b/parse_xml.cpp
index f12df00..518faec 100644
--- a/parse_xml.cpp
+++ b/parse_xml.cpp
@@ -16,10 +16,16 @@
 
 // Convert objects from and to xml.
 
+#define LOG_TAG "libvintf"
+#include <android-base/logging.h>
+
+#include "parse_xml.h"
+
+#include <type_traits>
+
 #include <tinyxml2.h>
 
 #include "parse_string.h"
-#include "parse_xml.h"
 
 namespace android {
 namespace vintf {
@@ -539,11 +545,35 @@
         std::vector<HalInterface> interfaces;
         if (!parseOptionalAttr(root, "format", HalFormat::HIDL, &object->format) ||
             !parseTextElement(root, "name", &object->name) ||
-            !parseChild(root, transportArchConverter, &object->transportArch) ||
+            !parseOptionalChild(root, transportArchConverter, {}, &object->transportArch) ||
             !parseChildren(root, versionConverter, &object->versions) ||
             !parseChildren(root, halInterfaceConverter, &interfaces)) {
             return false;
         }
+
+        switch (object->format) {
+            case HalFormat::HIDL: {
+                if (object->transportArch.empty()) {
+                    this->mLastError =
+                        "HIDL HAL '" + object->name + "' should have <transport> defined.";
+                    return false;
+                }
+            } break;
+            case HalFormat::NATIVE: {
+                if (!object->transportArch.empty()) {
+                    this->mLastError =
+                        "Native HAL '" + object->name + "' should not have <transport> defined.";
+                    return false;
+                }
+            } break;
+            default: {
+                LOG(FATAL) << "Unhandled HalFormat "
+                           << static_cast<typename std::underlying_type<HalFormat>::type>(
+                                  object->format);
+            } break;
+        }
+        if (!object->transportArch.isValid()) return false;
+
         object->interfaces.clear();
         for (auto &&interface : interfaces) {
             auto res = object->interfaces.emplace(interface.name,