summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifan Hong2017-10-09 17:26:39 -0500
committerandroid-build-merger2017-10-09 17:26:39 -0500
commit3fbce3d973a6a1eef1a81029dce9d7ff55bdfa59 (patch)
tree6179d7c876f81be6eda9804ed82df47577d5d14a
parentbcfa1767975a059dbb99ad06f4e98bfac7c5a29a (diff)
parent14c22fab94c922bad0876afc6099acef4ee22539 (diff)
downloadplatform-system-libvintf-3fbce3d973a6a1eef1a81029dce9d7ff55bdfa59.tar.gz
platform-system-libvintf-3fbce3d973a6a1eef1a81029dce9d7ff55bdfa59.tar.xz
platform-system-libvintf-3fbce3d973a6a1eef1a81029dce9d7ff55bdfa59.zip
Remove -Wno-error=unused-function am: a67b209b1c am: c1f8f3c5a6
am: 14c22fab94 Change-Id: I4f708f63f59d0b13b1cb4542f0896076c39ceb96
-rw-r--r--test/Android.bp1
-rw-r--r--test/main.cpp2
2 files changed, 2 insertions, 1 deletions
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 @@ cc_test {
30 cflags: [ 30 cflags: [
31 "-O0", 31 "-O0",
32 "-g", 32 "-g",
33 "-Wno-error=unused-function",
34 ], 33 ],
35 target: { 34 target: {
36 host: { 35 host: {
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<KernelConfigTypedValue> &gKernelConfigTypedValueConver
39extern const XmlConverter<HalManifest> &gHalManifestConverter; 39extern const XmlConverter<HalManifest> &gHalManifestConverter;
40extern const XmlConverter<CompatibilityMatrix> &gCompatibilityMatrixConverter; 40extern const XmlConverter<CompatibilityMatrix> &gCompatibilityMatrixConverter;
41 41
42#ifdef LIBVINTF_HOST
42static bool Contains(const std::string& str, const std::string& sub) { 43static bool Contains(const std::string& str, const std::string& sub) {
43 return str.find(sub) != std::string::npos; 44 return str.find(sub) != std::string::npos;
44} 45}
45#define EXPECT_CONTAINS(str, sub) \ 46#define EXPECT_CONTAINS(str, sub) \
46 EXPECT_TRUE(Contains((str), (sub))) << "Cannot find \"" << (sub) << "\" in \"" << (str) << "\"" 47 EXPECT_TRUE(Contains((str), (sub))) << "Cannot find \"" << (sub) << "\" in \"" << (str) << "\""
48#endif
47 49
48struct LibVintfTest : public ::testing::Test { 50struct LibVintfTest : public ::testing::Test {
49public: 51public: