diff options
| author | Yifan Hong <elsk@google.com> | 2021-04-06 18:42:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-06 18:42:08 +0000 |
| commit | 0a33576f7bba9957457ef6930e33e76e8ae31772 (patch) | |
| tree | 763bd8f569b91d69fd9a5ed11972d9b4eb56968d | |
| parent | d778b905f1ba9e1cd692c782e18d854888440007 (diff) | |
| parent | 8e8d529f8d7af138455cee73bf2c96f4b07513c9 (diff) | |
| download | native-0a33576f7bba9957457ef6930e33e76e8ae31772.tar.gz | |
Merge "lshal: Do not use lastError API." am: 8e8d529f8d
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1664665
Change-Id: I3e0f61ed58039d5383614e7b3933e3a5e6af1a18
| -rw-r--r-- | cmds/lshal/test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmds/lshal/test.cpp b/cmds/lshal/test.cpp index b6ff28d416..7c1ca91528 100644 --- a/cmds/lshal/test.cpp +++ b/cmds/lshal/test.cpp @@ -508,10 +508,10 @@ TEST_F(ListTest, DumpVintf) { EXPECT_THAT(output, HasSubstr("a.h.foo6@6.0::IFoo/6")); EXPECT_EQ("", err.str()); + std::string error; vintf::HalManifest m; - EXPECT_EQ(true, vintf::gHalManifestConverter(&m, out.str())) - << "--init-vintf does not emit valid HAL manifest: " - << vintf::gHalManifestConverter.lastError(); + EXPECT_EQ(true, vintf::gHalManifestConverter(&m, out.str(), &error)) + << "--init-vintf does not emit valid HAL manifest: " << error; } // test default columns |