diff options
| author | Shawn Willden <swillden@google.com> | 2019-11-26 09:00:08 -0700 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2020-02-11 15:51:03 -0700 |
| commit | fcc4c5c71b7a1a723ffa0f263507d7e103611d1e (patch) | |
| tree | 5f75c2f5061caa8fb937e83f7192adc154394f3a /keymaster/4.0/vts/functional/KeymasterHidlTest.cpp | |
| parent | 20a5d89241ef497f8be0fb99d7034906a5cfda69 (diff) | |
Remove dependency on libsoftkeymaster.
This is part of a refactor to facilitate reuse in Keymaster 4.1 VTS
tests.
Bug: 140193672
Bug: 140192237
Test: VtsHalKeymasterV4_0TargetTest
Change-Id: I9310a851648c028850f9795d303419c6a7e29a11
Merged-In: I9310a851648c028850f9795d303419c6a7e29a11
Diffstat (limited to 'keymaster/4.0/vts/functional/KeymasterHidlTest.cpp')
| -rw-r--r-- | keymaster/4.0/vts/functional/KeymasterHidlTest.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/keymaster/4.0/vts/functional/KeymasterHidlTest.cpp b/keymaster/4.0/vts/functional/KeymasterHidlTest.cpp index 7241984694..1fbd721e24 100644 --- a/keymaster/4.0/vts/functional/KeymasterHidlTest.cpp +++ b/keymaster/4.0/vts/functional/KeymasterHidlTest.cpp @@ -23,6 +23,7 @@ #include <android/hidl/manager/1.0/IServiceManager.h> #include <keymasterV4_0/key_param_output.h> +#include <keymasterV4_0/keymaster_utils.h> namespace android { namespace hardware { @@ -56,11 +57,11 @@ void KeymasterHidlTest::InitializeKeymaster() { .isOk()); } -void KeymasterHidlTest::SetUp() { +void KeymasterHidlTest::SetUpTestCase() { InitializeKeymaster(); - os_version_ = ::keymaster::GetOsVersion(); - os_patch_level_ = ::keymaster::GetOsPatchlevel(); + os_version_ = support::getOsVersion(); + os_patch_level_ = support::getOsPatchlevel(); auto service_manager = android::hidl::manager::V1_0::IServiceManager::getService(); ASSERT_NE(nullptr, service_manager.get()); |