diff options
| author | Steven Moreland <smoreland@google.com> | 2020-02-27 11:20:55 -0800 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2020-03-05 11:26:49 -0800 |
| commit | 8a7fdd8cd8237d75f5e6a2e649d9d47fe050328a (patch) | |
| tree | b7500c0021f0cf4be62bb4a7ebf6432d8ce07ccb | |
| parent | ec6f4f46df355c8e1fa8d0d42e1866a1502784b6 (diff) | |
| download | platform_system_libhidl-8a7fdd8cd8237d75f5e6a2e649d9d47fe050328a.tar.gz platform_system_libhidl-8a7fdd8cd8237d75f5e6a2e649d9d47fe050328a.tar.bz2 platform_system_libhidl-8a7fdd8cd8237d75f5e6a2e649d9d47fe050328a.zip | |
Avoid use of FQName globals.
They're being optimized out.
Bug: 148177595
Test: vts_ibase_test
Change-Id: I982ed5af65911d94a1b796c84cbe5a5fa784878a
(cherry picked from commit 05ebf2d104957381fdd0469c4b848fa53dfe48c5)
Merged-In: I982ed5af65911d94a1b796c84cbe5a5fa784878a
| -rw-r--r-- | transport/base/1.0/vts/functional/vts_ibase_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/transport/base/1.0/vts/functional/vts_ibase_test.cpp b/transport/base/1.0/vts/functional/vts_ibase_test.cpp index b96e3b04..63726318 100644 --- a/transport/base/1.0/vts/functional/vts_ibase_test.cpp +++ b/transport/base/1.0/vts/functional/vts_ibase_test.cpp @@ -82,7 +82,7 @@ std::map<std::string, std::vector<Hal>> gDeclaredServiceHalMap; std::mutex gDeclaredServiceHalMapMutex; void GetHal(const std::string& service, const FqInstance& instance) { - if (instance.getFqName() == android::gIBaseFqName) { + if (instance.getFqName().string() == IBase::descriptor) { return; } @@ -157,7 +157,7 @@ class VtsHalBaseV1_0TargetTest : public ::testing::Test { << "Unable to parse interface: '" << debug_info.interfaceName.c_str(); FqInstance fqInstance; ASSERT_TRUE(fqInstance.setTo(fqName, debug_info.instanceName.c_str())); - if (fqInstance.getFqName() != android::gIBaseFqName) { + if (fqInstance.getFqName().string() != IBase::descriptor) { result[debug_info.pid].insert(fqInstance); } } |