commit 6bce1a665aa1bebc6fe3731eeff962c8aae77c62
author Yifan Hong <elsk@google.com> Wed Jan 31 13:30:04 2018 -0800
committer Yifan Hong <elsk@google.com> Wed Jan 31 15:01:19 2018 -0800
tree 2746b64e4098bb5e34c998952578c3dc26f50382
parent e3a9234dd75b9769a63f8e410c10549031a5d489

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

parse_xml.cpp

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 @@
             }
         }
 // Do not check for target-side libvintf to avoid restricting ability for upgrade accidentally.
-#ifdef LIBVINTF_HOST
+#ifndef LIBVINTF_TARGET
         if (!checkAdditionalRestrictionsOnHal(*object)) {
             return false;
         }
@@ -521,7 +521,7 @@
         return true;
     }
 
-#ifdef LIBVINTF_HOST
+#ifndef LIBVINTF_TARGET
    private:
     bool checkAdditionalRestrictionsOnHal(const MatrixHal& hal) const {
         if (hal.getName() == "netutils-wrapper") {
@@ -650,7 +650,7 @@
             return false;
         }
 // Do not check for target-side libvintf to avoid restricting upgrade accidentally.
-#ifdef LIBVINTF_HOST
+#ifndef LIBVINTF_TARGET
         if (!checkAdditionalRestrictionsOnHal(*object)) {
             return false;
         }
@@ -658,7 +658,7 @@
         return true;
     }
 
-#ifdef LIBVINTF_HOST
+#ifndef LIBVINTF_TARGET
    private:
     bool checkAdditionalRestrictionsOnHal(const ManifestHal& hal) const {
         if (hal.getName() == "netutils-wrapper") {