commit f06dc6d791b8e2c05e506603e2ecfcbfa430805c
author Yifan Hong <elsk@google.com> Sat Oct 17 00:28:16 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Oct 17 00:28:16 2020 +0000
tree cd266c8eff7666cafd3fef25436ef7738ed62dd2
parent 2dd1a2d01c7c2069db16e7a95fd83f02b0069c4b
parent 455b7a5b3bac8b3cb6b85f6ee6f84b5516f0044c

Merge "lshal: resistent to metaversion updates." am: 3f21eafad7 am: e3ce34306e am: 669dcbb01b am: 455b7a5b3b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1461294

Change-Id: I695553bc9a351c81f55487bc6fdb84b7c2b60c34

cmds/lshal/test.cpp

diff --git a/cmds/lshal/test.cpp b/cmds/lshal/test.cpp
index 9964888..ba6cdf1 100644
--- a/cmds/lshal/test.cpp
+++ b/cmds/lshal/test.cpp
@@ -479,8 +479,7 @@
 }
 
 TEST_F(ListTest, DumpVintf) {
-    const std::string expected = "<manifest version=\"2.0\" type=\"device\">\n"
-                                 "    <hal format=\"hidl\">\n"
+    const std::string expected = "    <hal format=\"hidl\">\n"
                                  "        <name>a.h.foo1</name>\n"
                                  "        <transport>hwbinder</transport>\n"
                                  "        <fqname>@1.0::IFoo/1</fqname>\n"
@@ -499,8 +498,7 @@
                                  "        <name>a.h.foo4</name>\n"
                                  "        <transport arch=\"32\">passthrough</transport>\n"
                                  "        <fqname>@4.0::IFoo/4</fqname>\n"
-                                 "    </hal>\n"
-                                 "</manifest>";
+                                 "    </hal>\n";
 
     optind = 1; // mimic Lshal::parseArg()
     EXPECT_EQ(0u, mockList->main(createArg({"lshal", "--init-vintf"})));