Reland^2: Use "gfxstream" namespace
This reverts commit 04c96274efbb8c845f7a4a8609f85fd4c6982ef3.
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
Change-Id: Iaf9c35e89938613e998110641a5112872e079c57
diff --git a/system/vulkan_enc/ResourceTracker.cpp b/system/vulkan_enc/ResourceTracker.cpp
index 023cca1..d5e3645 100644
--- a/system/vulkan_enc/ResourceTracker.cpp
+++ b/system/vulkan_enc/ResourceTracker.cpp
@@ -144,7 +144,8 @@
using android::base::guest::Lock;
using android::base::guest::WorkPool;
-namespace goldfish_vk {
+namespace gfxstream {
+namespace vk {
#define MAKE_HANDLE_MAPPING_FOREACH(type_name, map_impl, map_to_u64_impl, map_from_u64_impl) \
void mapHandles_##type_name(type_name* handles, size_t count) override { \
@@ -8375,4 +8376,5 @@
LIST_TRIVIAL_TRANSFORMED_TYPES(DEFINE_TRANSFORMED_TYPE_IMPL)
-} // namespace goldfish_vk
+} // namespace vk
+} // namespace gfxstream
