summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot2017-10-10 03:03:56 -0500
committerandroid-build-team Robot2017-10-10 03:03:56 -0500
commitdd1dbc7305cd466a36c9afa7627878e136f8be7f (patch)
tree6179d7c876f81be6eda9804ed82df47577d5d14a
parent07ebd392957aeb8eebff080c0df6a1db5d6e7841 (diff)
parentd9d6758ae537f92549290c8de346dbbcf3131a50 (diff)
downloadplatform-system-libvintf-dd1dbc7305cd466a36c9afa7627878e136f8be7f.tar.gz
platform-system-libvintf-dd1dbc7305cd466a36c9afa7627878e136f8be7f.tar.xz
platform-system-libvintf-dd1dbc7305cd466a36c9afa7627878e136f8be7f.zip
Snap for 4386413 from d9d6758ae537f92549290c8de346dbbcf3131a50 to pi-release
Change-Id: Ia339fc4cb33a941b65d740743dd6f6761e052865
-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: