summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifan Hong2018-01-31 15:30:04 -0600
committerYifan Hong2018-01-31 17:01:19 -0600
commit6bce1a665aa1bebc6fe3731eeff962c8aae77c62 (patch)
tree2746b64e4098bb5e34c998952578c3dc26f50382 /parse_xml.cpp
parente3a9234dd75b9769a63f8e410c10549031a5d489 (diff)
downloadplatform-system-libvintf-6bce1a665aa1bebc6fe3731eeff962c8aae77c62.tar.gz
platform-system-libvintf-6bce1a665aa1bebc6fe3731eeff962c8aae77c62.tar.xz
platform-system-libvintf-6bce1a665aa1bebc6fe3731eeff962c8aae77c62.zip
remove LIBVINTF_HOST macro
There is a mixed use of LIBVINTF_HOST and LIBVINTF_TARGET, and for libvintftest, LIBVINTF_HOST is not even defined properly. Remove the use of LIBVINTF_HOST and replace with LIBVINTF_TARGET instead. Test: libvintf_test Test: vintf_object_test Change-Id: I557e65376dfd1d0fe953e9a7a03a47f227596460
Diffstat (limited to 'parse_xml.cpp')
-rw-r--r--parse_xml.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/parse_xml.cpp b/parse_xml.cpp
index 5900f27..9f53d72 100644
--- a/parse_xml.cpp
+++ b/parse_xml.cpp
@@ -513,7 +513,7 @@ struct MatrixHalConverter : public XmlNodeConverter<MatrixHal> {
513 } 513 }
514 } 514 }
515// Do not check for target-side libvintf to avoid restricting ability for upgrade accidentally. 515// Do not check for target-side libvintf to avoid restricting ability for upgrade accidentally.
516#ifdef LIBVINTF_HOST 516#ifndef LIBVINTF_TARGET
517 if (!checkAdditionalRestrictionsOnHal(*object)) { 517 if (!checkAdditionalRestrictionsOnHal(*object)) {
518 return false; 518 return false;
519 } 519 }
@@ -521,7 +521,7 @@ struct MatrixHalConverter : public XmlNodeConverter<MatrixHal> {
521 return true; 521 return true;
522 } 522 }
523 523
524#ifdef LIBVINTF_HOST 524#ifndef LIBVINTF_TARGET
525 private: 525 private:
526 bool checkAdditionalRestrictionsOnHal(const MatrixHal& hal) const { 526 bool checkAdditionalRestrictionsOnHal(const MatrixHal& hal) const {
527 if (hal.getName() == "netutils-wrapper") { 527 if (hal.getName() == "netutils-wrapper") {
@@ -650,7 +650,7 @@ struct ManifestHalConverter : public XmlNodeConverter<ManifestHal> {
650 return false; 650 return false;
651 } 651 }
652// Do not check for target-side libvintf to avoid restricting upgrade accidentally. 652// Do not check for target-side libvintf to avoid restricting upgrade accidentally.
653#ifdef LIBVINTF_HOST 653#ifndef LIBVINTF_TARGET
654 if (!checkAdditionalRestrictionsOnHal(*object)) { 654 if (!checkAdditionalRestrictionsOnHal(*object)) {
655 return false; 655 return false;
656 } 656 }
@@ -658,7 +658,7 @@ struct ManifestHalConverter : public XmlNodeConverter<ManifestHal> {
658 return true; 658 return true;
659 } 659 }
660 660
661#ifdef LIBVINTF_HOST 661#ifndef LIBVINTF_TARGET
662 private: 662 private:
663 bool checkAdditionalRestrictionsOnHal(const ManifestHal& hal) const { 663 bool checkAdditionalRestrictionsOnHal(const ManifestHal& hal) const {
664 if (hal.getName() == "netutils-wrapper") { 664 if (hal.getName() == "netutils-wrapper") {