Snap for 4373608 from 8977ba3867816ede43c843fd481f37126014db6a to pi-release

Change-Id: I1a2ba0f2fc157e73935461eeefee8de38bd1321a

3 files changed, 83 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index 2b39ad8..c2419e4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -90,6 +90,19 @@ cc_binary {
 }
 
 cc_binary_host {
+    name: "checkvintf",
+    defaults: ["libvintf-defaults"],
+    shared_libs: [
+        "libvintf",
+        "libbase"
+    ],
+    srcs: [
+        "check_vintf.cpp",
+        "utils.cpp"
+    ],
+}
+
+cc_binary_host {
     name: "assemble_vintf",
     defaults: ["libvintf-defaults"],
     shared_libs: [
diff --git a/check_vintf.cpp b/check_vintf.cpp
new file mode 100644
index 0000000..211702e
--- /dev/null
+++ b/check_vintf.cpp
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <iostream>
+
+#include <vintf/parse_xml.h>
+#include "utils.h"
+
+namespace android {
+namespace vintf {
+
+template <typename T>
+std::unique_ptr<T> readObject(const std::string& path, const XmlConverter<T>& converter) {
+    std::string xml;
+    status_t err = details::gFetcher->fetch(path, xml);
+    if (err != OK) {
+        std::cerr << "Error: Cannot read '" << path << "': " << strerror(-err) << std::endl;
+        return nullptr;
+    }
+    auto ret = std::make_unique<T>();
+    if (!converter(ret.get(), xml)) {
+        std::cerr << "Error: Cannot parse '" << path << "': " << converter.lastError() << std::endl;
+        return nullptr;
+    }
+    return ret;
+}
+
+}  // namespace vintf
+}  // namespace android
+
+int main(int argc, char** argv) {
+    using namespace android::vintf;
+    if (argc < 3) {
+        std::cerr << "usage: " << argv[0] << " <manifest.xml> <matrix.xml>" << std::endl
+                  << "    Checks compatibility between a manifest and a compatibility matrix."
+                  << std::endl;
+        return -1;
+    }
+
+    auto manifest = readObject(argv[1], gHalManifestConverter);
+    auto matrix = readObject(argv[2], gCompatibilityMatrixConverter);
+    if (manifest == nullptr || matrix == nullptr) {
+        return -1;
+    }
+
+    std::string error;
+    if (!manifest->checkCompatibility(*matrix, &error)) {
+        std::cerr << "Error: Incompatible: " << error << std::endl;
+        std::cout << "false" << std::endl;
+        return 1;
+    }
+
+    std::cout << "true" << std::endl;
+    return 0;
+}
diff --git a/utils.h b/utils.h
index 973c524..c08a22e 100644
--- a/utils.h
+++ b/utils.h
@@ -23,9 +23,8 @@
 
 #include <android-base/logging.h>
 #include <utils/Errors.h>
-
-#include "RuntimeInfo.h"
-#include "parse_xml.h"
+#include <vintf/RuntimeInfo.h>
+#include <vintf/parse_xml.h>
 
 namespace android {
 namespace vintf {