Snap for 4693621 from 9adf115f40240d1f8bfd0266c2445f7a9b3e0262 to pi-release

Change-Id: Ic74c65776067394e5aa7860265311b62421eb6f8

2 files changed, 36 insertions, 6 deletions

diff --git a/AssembleVintf.cpp b/AssembleVintf.cpp
index 7f86b94..ef7c8ba 100644
--- a/AssembleVintf.cpp
+++ b/AssembleVintf.cpp
@@ -263,6 +263,37 @@ class AssembleVintfImpl : public AssembleVintf {
 
     std::basic_ostream<char>& out() const { return mOutRef == nullptr ? std::cout : *mOutRef; }
 
+    // If -c is provided, check it.
+    bool checkDualFile(const HalManifest& manifest, const CompatibilityMatrix& matrix) {
+        if (getBooleanFlag("PRODUCT_ENFORCE_VINTF_MANIFEST")) {
+            std::string error;
+            if (!manifest.checkCompatibility(matrix, &error)) {
+                std::cerr << "Not compatible: " << error << std::endl;
+                return false;
+            }
+        }
+
+        // Check HALs in device manifest that are not in framework matrix.
+        if (getBooleanFlag("VINTF_ENFORCE_NO_UNUSED_HALS")) {
+            auto unused = manifest.checkUnusedHals(matrix);
+            if (!unused.empty()) {
+                std::cerr << "Error: The following instances are in the device manifest but "
+                          << "not specified in framework compatibility matrix: " << std::endl
+                          << "    " << android::base::Join(unused, "\n    ") << std::endl
+                          << "Suggested fix:" << std::endl
+                          << "1. Check for any typos in device manifest or framework compatibility "
+                          << "matrices with FCM version >= " << matrix.level() << "." << std::endl
+                          << "2. Add them to any framework compatibility matrix with FCM "
+                          << "version >= " << matrix.level() << " where applicable." << std::endl
+                          << "3. Add them to DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE."
+                          << std::endl;
+
+                return false;
+            }
+        }
+        return true;
+    }
+
     template <typename S>
     using Schemas = std::vector<Named<S>>;
     using HalManifests = Schemas<HalManifest>;
@@ -342,8 +373,7 @@ class AssembleVintfImpl : public AssembleVintf {
                           << std::endl;
                 return false;
             }
-            if (!halManifest->checkCompatibility(checkMatrix, &error)) {
-                std::cerr << "Not compatible: " << error << std::endl;
+            if (!checkDualFile(*halManifest, checkMatrix)) {
                 return false;
             }
         }
@@ -369,7 +399,7 @@ class AssembleVintfImpl : public AssembleVintf {
 
     bool setDeviceFcmVersion(HalManifest* manifest) {
         // Not needed for generating empty manifest for DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE.
-        if (getBooleanFlag("IGNORE_TARGET_FCM_VERSION")) {
+        if (getBooleanFlag("VINTF_IGNORE_TARGET_FCM_VERSION")) {
             return true;
         }
 
@@ -513,9 +543,7 @@ class AssembleVintfImpl : public AssembleVintf {
         out() << gCompatibilityMatrixConverter(*matrix, mSerializeFlags);
         out().flush();
 
-        if (checkManifest != nullptr && getBooleanFlag("PRODUCT_ENFORCE_VINTF_MANIFEST") &&
-            !checkManifest->checkCompatibility(*matrix, &error)) {
-            std::cerr << "Not compatible: " << error << std::endl;
+        if (checkManifest != nullptr && !checkDualFile(*checkManifest, *matrix)) {
             return false;
         }
 
diff --git a/test/AssembleVintfTest.cpp b/test/AssembleVintfTest.cpp
index b629c74..33acc1e 100644
--- a/test/AssembleVintfTest.cpp
+++ b/test/AssembleVintfTest.cpp
@@ -36,6 +36,8 @@ class AssembleVintfTest : public ::testing::Test {
         auto s = makeStream("");
         mOutputStream = s.get();
         mInstance->setOutputStream(std::move(s));
+
+        getInstance()->setFakeEnv("PRODUCT_ENFORCE_VINTF_MANIFEST", "true");
     }
     virtual void TearDown() override { mInstance = nullptr; }