commit 3c22473b9f4eafd8de8ba81dec9805e53101022c
author Yifan Hong <elsk@google.com> Mon Oct 23 17:27:10 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 23 17:27:10 2017 +0000
tree f2cf244231e56422ef13c3a4f79b8b0d7784fc39
parent a67b209b1c2678304d3c5eb8deb8d0bda9d74902
parent eb14e3013ea11b3d47d40fa860f16345c607fef6

Merge "assemble_vintf conflict of hal names for multiple manifest fragments"

test/Android.bp

diff --git a/test/Android.bp b/test/Android.bp
index c098152..4849a63 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -30,7 +30,6 @@
     cflags: [
         "-O0",
         "-g",
-        "-Wno-error=unused-function",
     ],
     target: {
         host: {

test/main.cpp

diff --git a/test/main.cpp b/test/main.cpp
index 495b35c..507e0d1 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -39,11 +39,13 @@
 extern const XmlConverter<HalManifest> &gHalManifestConverter;
 extern const XmlConverter<CompatibilityMatrix> &gCompatibilityMatrixConverter;
 
+#ifdef LIBVINTF_HOST
 static bool Contains(const std::string& str, const std::string& sub) {
     return str.find(sub) != std::string::npos;
 }
 #define EXPECT_CONTAINS(str, sub) \
     EXPECT_TRUE(Contains((str), (sub))) << "Cannot find \"" << (sub) << "\" in \"" << (str) << "\""
+#endif
 
 struct LibVintfTest : public ::testing::Test {
 public: