commit 5f4e57eb8cf109e80927c435ed084a380f7e7518
author Yifan Hong <elsk@google.com> Tue Apr 23 15:16:25 2019 -0700
committer Yifan Hong <elsk@google.com> Tue Apr 23 22:40:10 2019 -0700
tree 40982df76664c05210ec60281f8d893de5905812
parent 6e68a9ae4994240585b530e3d7b1e48a749f8b9c

Add product manifest and fragments.

Product manifest lives at /product/etc/vintf/manifest.xml
and fragments lives at /product/etc/vintf/manifest/*.xml.

Modules in the product partition that serves HIDL HALs should
declare them in the product manifest (fragments).

Bug: 130714844
Bug: 126770403
Test: vintf_object_test
Change-Id: I3812e4fcc305c163df281346ef2fa2dc5ad49397

VintfObject.cpp

diff --git a/VintfObject.cpp b/VintfObject.cpp
index e66bcbe..2badd18 100644
--- a/VintfObject.cpp
+++ b/VintfObject.cpp
@@ -339,12 +339,40 @@
     return out->fetchAllInformation(getFileSystem().get(), kVendorLegacyMatrix, error);
 }
 
+// Priority:
+// 1. /system/etc/vintf/manifest.xml
+//    + /system/etc/vintf/manifest/*.xml if they exist
+//    + /product/etc/vintf/manifest.xml if it exists
+//    + /product/etc/vintf/manifest/*.xml if they exist
+// 2. (deprecated) /system/manifest.xml
 status_t VintfObject::fetchFrameworkHalManifest(HalManifest* out, std::string* error) {
-    HalManifest etcManifest;
-    if (etcManifest.fetchAllInformation(getFileSystem().get(), kSystemManifest, error) == OK) {
-        *out = std::move(etcManifest);
-        return addDirectoryManifests(kSystemManifestFragmentDir, out, error);
+    auto systemEtcStatus = fetchOneHalManifest(kSystemManifest, out, error);
+    if (systemEtcStatus == OK) {
+        auto dirStatus = addDirectoryManifests(kSystemManifestFragmentDir, out, error);
+        if (dirStatus != OK) {
+            return dirStatus;
+        }
+
+        HalManifest productManifest;
+        auto productStatus = fetchOneHalManifest(kProductManifest, &productManifest, error);
+        if (productStatus != OK && productStatus != NAME_NOT_FOUND) {
+            return productStatus;
+        }
+        if (productStatus == OK) {
+            if (!out->addAll(&productManifest, error)) {
+                if (error) {
+                    error->insert(0, "Cannot add " + kProductManifest + ":");
+                }
+                return UNKNOWN_ERROR;
+            }
+        }
+
+        return addDirectoryManifests(kProductManifestFragmentDir, out, error);
+    } else {
+        LOG(WARNING) << "Cannot fetch " << kSystemManifest << ": "
+                     << (error ? *error : strerror(-systemEtcStatus));
     }
+
     return out->fetchAllInformation(getFileSystem().get(), kSystemLegacyManifest, error);
 }
 
@@ -590,10 +618,12 @@
 const std::string kVendorMatrix = kVendorVintfDir + "compatibility_matrix.xml";
 const std::string kOdmManifest = kOdmVintfDir + "manifest.xml";
 const std::string kProductMatrix = kProductVintfDir + "compatibility_matrix.xml";
+const std::string kProductManifest = kProductVintfDir + "manifest.xml";
 
 const std::string kVendorManifestFragmentDir = kVendorVintfDir + "manifest/";
 const std::string kSystemManifestFragmentDir = kSystemVintfDir + "manifest/";
 const std::string kOdmManifestFragmentDir = kOdmVintfDir + "manifest/";
+const std::string kProductManifestFragmentDir = kProductVintfDir + "manifest/";
 
 const std::string kVendorLegacyManifest = "/vendor/manifest.xml";
 const std::string kVendorLegacyMatrix = "/vendor/compatibility_matrix.xml";