commit a5ddddfcbf12ae14c560ca4a32d56093e8374efc
author Yifan Hong <elsk@google.com> Thu Jan 18 18:50:13 2018 -0800
committer Yifan Hong <elsk@google.com> Fri Jan 19 11:17:55 2018 -0800
tree 97ec56ca7818abb1392d760008d7620937156eb8
parent ccbea05db614b552418b06e564c94fec1278006b

VintfObject: /system/manifest.xml => /system/etc/vintf/manifest.xml

Test: vintf_object_tests
Test: boots
Bug: 36790901
Change-Id: I5ce591e5af63f4e075c11414e1add9b0166e1b6d

VintfObject.cpp

diff --git a/VintfObject.cpp b/VintfObject.cpp
index e0eb2f5..4a3e235 100644
--- a/VintfObject.cpp
+++ b/VintfObject.cpp
@@ -509,7 +509,7 @@
 const std::string kVendorVintfDir = "/vendor/etc/vintf/";
 
 const std::string kVendorManifest = kVendorVintfDir + "manifest.xml";
-const std::string kSystemManifest = "/system/manifest.xml";
+const std::string kSystemManifest = kSystemVintfDir + "manifest.xml";
 
 const std::string kVendorLegacyManifest = "/vendor/manifest.xml";
 const std::string kVendorLegacyMatrix = "/vendor/compatibility_matrix.xml";