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
diff --git a/test/LibVintfTest.cpp b/test/LibVintfTest.cpp
index e7a609a..149afc5 100644
--- a/test/LibVintfTest.cpp
+++ b/test/LibVintfTest.cpp
@@ -44,7 +44,7 @@
}
#define EXPECT_IN(sub, str) EXPECT_TRUE(In((sub), (str))) << (str);
-#ifdef LIBVINTF_HOST
+#ifndef LIBVINTF_TARGET
#define EXPECT_CONTAINS(str, sub) EXPECT_IN(sub, str);
#endif
@@ -1598,7 +1598,7 @@
<< gCompatibilityMatrixConverter.lastError();
// only host libvintf hardcodes netutils-wrapper version requirements
-#ifdef LIBVINTF_HOST
+#ifndef LIBVINTF_TARGET
matrixXml =
"<compatibility-matrix version=\"1.0\" type=\"device\">"
@@ -1640,7 +1640,7 @@
"netutils-wrapper HAL must specify exactly one version x.0, but multiple <version> element "
"is specified.");
-#endif // LIBVINTF_HOST
+#endif // LIBVINTF_TARGET
}
TEST_F(LibVintfTest, NetutilsWrapperManifest) {
@@ -1658,7 +1658,7 @@
EXPECT_TRUE(gHalManifestConverter(&manifest, manifestXml)) << gHalManifestConverter.lastError();
// only host libvintf hardcodes netutils-wrapper version requirements
-#ifdef LIBVINTF_HOST
+#ifndef LIBVINTF_TARGET
manifestXml =
"<manifest version=\"1.0\" type=\"framework\">"
@@ -1687,7 +1687,7 @@
"netutils-wrapper HAL must specify exactly one version x.0, but multiple <version> element "
"is specified.");
-#endif // LIBVINTF_HOST
+#endif // LIBVINTF_TARGET
}
TEST_F(LibVintfTest, KernelConfigConditionTest) {