commit e73ae654c3b7aad38e8afdabe321b3fc95876d0c
author Yifan Hong <elsk@google.com> Fri Jan 10 19:01:30 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 10 19:01:30 2020 +0000
tree 635f476097d5ea9116963d0bb5df8968b1ea56f3
parent 60c55c4e3a9392ed98a5886b3cc9d451938f7974
parent 0dfc3d538c8879090df2dc6d5dad742f78cf0466

Merge changes Ibb396ee9,I831acde1

* changes:
  checkvintf: Add --check-one option.
  checkvintf: use libbase logs.

Android.bp

diff --git a/Android.bp b/Android.bp
index 71d3c14..a78a6a3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -112,6 +112,7 @@
     static_libs: [
         "libbase",
         "libhidl-gen-utils",
+        "liblog",
         "libvintf",
         "libutils",
         "libtinyxml2",

VintfObject.cpp

diff --git a/VintfObject.cpp b/VintfObject.cpp
index fe57152..c13dc64 100644
--- a/VintfObject.cpp
+++ b/VintfObject.cpp
@@ -556,7 +556,7 @@
 const std::string kVendorVintfDir = "/vendor/etc/vintf/";
 const std::string kOdmVintfDir = "/odm/etc/vintf/";
 const std::string kProductVintfDir = "/product/etc/vintf/";
-const std::string kSystemExtVintfDir = "/system_ext/etc/vintf";
+const std::string kSystemExtVintfDir = "/system_ext/etc/vintf/";
 
 const std::string kVendorManifest = kVendorVintfDir + "manifest.xml";
 const std::string kSystemManifest = kSystemVintfDir + "manifest.xml";