summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yifan Hong <elsk@google.com> 2018-01-26 01:45:35 +0000
committer android-build-merger <android-build-merger@google.com> 2018-01-26 01:45:35 +0000
commite705c9f9f12201d7dfa9f2254885deb4ba28efc7 (patch)
tree90f6e1d3832587e723ac1f4ac189d01bf4a23a23
parent5b5589df88882aa087598aa17725d0e833b7f461 (diff)
parent0a81b908d770c5a5d9776f4ea064273f2c17264e (diff)
Merge "lshal --init-vintf: do not put empty <sepolicy> tag" am: 3cbc5893c6 am: 38de280b59
am: 0a81b908d7 Change-Id: I420eef165473edf9be54f5c947639934d46c11f0
-rw-r--r--cmds/lshal/ListCommand.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/cmds/lshal/ListCommand.cpp b/cmds/lshal/ListCommand.cpp
index e4b3c90480..fab13a0617 100644
--- a/cmds/lshal/ListCommand.cpp
+++ b/cmds/lshal/ListCommand.cpp
@@ -265,9 +265,6 @@ void ListCommand::dumpVintf(const NullableOStream<std::ostream>& out) const {
<< " <interface> declared; users will have to write them by hand." << std::endl
<< " 4. A HAL with lower minor version can be overridden by a HAL with" << std::endl
<< " higher minor version if they have the same name and major version." << std::endl
- << " 5. sepolicy version is set to 0.0. It is recommended that the entry" << std::endl
- << " is removed from the manifest file and written by assemble_vintf" << std::endl
- << " at build time." << std::endl
<< "-->" << std::endl;
vintf::HalManifest manifest;
@@ -364,7 +361,7 @@ void ListCommand::dumpVintf(const NullableOStream<std::ostream>& out) const {
}
}
});
- out << vintf::gHalManifestConverter(manifest);
+ out << vintf::gHalManifestConverter(manifest, vintf::SerializeFlag::HALS_ONLY);
}
static Architecture fromBaseArchitecture(::android::hidl::base::V1_0::DebugInfo::Architecture a) {