Reland^2: Use "gfxstream" namespace This reverts commit d37d7c8c0cdf6b84d453cb41e358094880a8f3b5. Reland adds in aosp/2516595 which was only built on the "full" target and removes namespace around window methods to satisfy MacOS build. Bug: b/271464937 Test: android build Test: cmake build Test: ATP MacOS build Change-Id: Ida36ac16f9c3b98aedd744d21c9b27e9063a8eea
diff --git a/stream-servers/RenderThread.cpp b/stream-servers/RenderThread.cpp index b9b93db..c90a382 100644 --- a/stream-servers/RenderThread.cpp +++ b/stream-servers/RenderThread.cpp
@@ -46,11 +46,13 @@ #include <unordered_map> +namespace gfxstream { + using android::base::AutoLock; using android::base::EventHangMetadata; using android::base::MessageChannel; - -namespace emugl { +using emugl::GfxApiLogger; +using vk::VkDecoderContext; struct RenderThread::SnapshotObjects { RenderThreadInfo* threadInfo; @@ -292,7 +294,7 @@ // Framebuffer initialization is asynchronous, so we need to make sure // it's completely initialized before running any GL commands. FrameBuffer::waitUntilInitialized(); - if (goldfish_vk::getGlobalVkEmulation()) { + if (vk::getGlobalVkEmulation()) { tInfo.m_vkInfo.emplace(); } @@ -568,4 +570,4 @@ return 0; } -} // namespace emugl +} // namespace gfxstream