VintfObject: /vendor/etc/ => /vendor/etc/vintf
... symmetric to /system/etc/vintf.
Test: vintf_object_tests
Bug: 36790901
Change-Id: I924f52b9713708d1bbabf87e852fead20cefc63b
diff --git a/VintfObject.cpp b/VintfObject.cpp
index 0fb4ee2..e0eb2f5 100644
--- a/VintfObject.cpp
+++ b/VintfObject.cpp
@@ -171,10 +171,10 @@
// Priority for loading vendor manifest:
// 1. If {sku} sysprop is set and both files exist,
-// /vendor/etc/manifest.xml + /odm/etc/manifest_{sku}.xml
+// /vendor/etc/vintf/manifest.xml + /odm/etc/manifest_{sku}.xml
// 2. If both files exist,
-// /vendor/etc/manifest.xml + /odm/etc/manifest.xml
-// 3. If file exists, /vendor/etc/manifest.xml
+// /vendor/etc/vintf/manifest.xml + /odm/etc/manifest.xml
+// 3. If file exists, /vendor/etc/vintf/manifest.xml
// 4. If {sku} sysprop is set and file exists,
// /odm/etc/manifest_{sku}.xml
// 5. If file exists, /odm/etc/manifest.xml
@@ -506,7 +506,7 @@
}
const std::string kSystemVintfDir = "/system/etc/vintf/";
-const std::string kVendorVintfDir = "/vendor/etc/";
+const std::string kVendorVintfDir = "/vendor/etc/vintf/";
const std::string kVendorManifest = kVendorVintfDir + "manifest.xml";
const std::string kSystemManifest = "/system/manifest.xml";