From b448a7064549053db3543e84c0471c4ace76ca57 Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Mon, 14 Mar 2022 02:18:08 -0700 Subject: [PATCH] Fix jenkins/opk_optee after v17 merge [ Merge of http://go/wvgerrit/145349 ] - Remove wvcdm namespace from test_clock.cpp Bug: 224375138 Test: GtsMediaTestCases on sunfish Change-Id: I239b692fd2103bd3d0626a145e99fc688c446256 --- libwvdrmengine/cdm/util/test/test_clock.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libwvdrmengine/cdm/util/test/test_clock.cpp b/libwvdrmengine/cdm/util/test/test_clock.cpp index 29b964df..18331bb6 100644 --- a/libwvdrmengine/cdm/util/test/test_clock.cpp +++ b/libwvdrmengine/cdm/util/test/test_clock.cpp @@ -13,7 +13,7 @@ namespace wvutil { namespace { // A fake clock that only advances when TestSleep::Sleep is called. -class FakeClock : public wvcdm::TestSleep::CallBack { +class FakeClock : public TestSleep::CallBack { public: FakeClock() { auto now = std::chrono::system_clock().now(); @@ -34,7 +34,7 @@ FakeClock* g_fake_clock = nullptr; // On devices running a fake OEMCrypto, we can use a fake sleep and fake time. int64_t Clock::GetCurrentTime() { - wvcdm::TestSleep::SyncFakeClock(); + TestSleep::SyncFakeClock(); if (g_fake_clock == nullptr) g_fake_clock = new FakeClock(); return g_fake_clock->now() / 1000; }