Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a81b908 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "lshal --init-vintf: do not put empty <sepolicy> tag" am: 3cbc5893 

am: 38de280b

Change-Id: I6e3c69d8b00d224352c4a5a265fe2145e4395afc
parents 25889939 38de280b

cmds/lshal/ListCommand.cpp

+1 −4
Original line number Diff line number Diff line
@@ -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) {