summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifan Hong2018-03-13 14:01:24 -0500
committerYifan Hong2018-03-13 20:46:06 -0500
commitce4289b9dc2706687d1515dc6e120fd030e8787f (patch)
treef28de4d1d996f8d745ee624aa211831042098f2b /parse_xml.cpp
parent77ddebccfbfabaed6283e70e534af6722f11e5e3 (diff)
downloadplatform-system-libvintf-ce4289b9dc2706687d1515dc6e120fd030e8787f.tar.gz
platform-system-libvintf-ce4289b9dc2706687d1515dc6e120fd030e8787f.tar.xz
platform-system-libvintf-ce4289b9dc2706687d1515dc6e120fd030e8787f.zip
Add ManifestHal::isOverride().
Hide the isOverride field. Bug: 73556059 Test: vts_treble_vintf_test Test: libvintf_test Change-Id: Ib7d4a96e7043124617841277b06afc456d01672a
Diffstat (limited to 'parse_xml.cpp')
-rw-r--r--parse_xml.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/parse_xml.cpp b/parse_xml.cpp
index bca26e1..bf8889f 100644
--- a/parse_xml.cpp
+++ b/parse_xml.cpp
@@ -608,14 +608,14 @@ struct ManifestHalConverter : public XmlNodeConverter<ManifestHal> {
608 appendChild(root, transportArchConverter(hal.transportArch, d)); 608 appendChild(root, transportArchConverter(hal.transportArch, d));
609 appendChildren(root, versionConverter, hal.versions, d); 609 appendChildren(root, versionConverter, hal.versions, d);
610 appendChildren(root, halInterfaceConverter, iterateValues(hal.interfaces), d); 610 appendChildren(root, halInterfaceConverter, iterateValues(hal.interfaces), d);
611 if (hal.isOverride) { 611 if (hal.isOverride()) {
612 appendAttr(root, "override", hal.isOverride); 612 appendAttr(root, "override", hal.isOverride());
613 } 613 }
614 } 614 }
615 bool buildObject(ManifestHal* object, NodeType* root, std::string* error) const override { 615 bool buildObject(ManifestHal* object, NodeType* root, std::string* error) const override {
616 std::vector<HalInterface> interfaces; 616 std::vector<HalInterface> interfaces;
617 if (!parseOptionalAttr(root, "format", HalFormat::HIDL, &object->format, error) || 617 if (!parseOptionalAttr(root, "format", HalFormat::HIDL, &object->format, error) ||
618 !parseOptionalAttr(root, "override", false, &object->isOverride, error) || 618 !parseOptionalAttr(root, "override", false, &object->mIsOverride, error) ||
619 !parseTextElement(root, "name", &object->name, error) || 619 !parseTextElement(root, "name", &object->name, error) ||
620 !parseOptionalChild(root, transportArchConverter, {}, &object->transportArch, error) || 620 !parseOptionalChild(root, transportArchConverter, {}, &object->transportArch, error) ||
621 !parseChildren(root, versionConverter, &object->versions, error) || 621 !parseChildren(root, versionConverter, &object->versions, error) ||