Revert "Use "gfxstream" namespace" am: 5d733516cb

Original change: https://android-review.googlesource.com/c/platform/external/gfxstream-protocols/+/2514001

Change-Id: I0e3fac15c226082d4e1b2a9d6e749231b39414b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4 files changed, 10 insertions, 37 deletions

diff --git a/registry/vulkan/scripts/cereal/decoder.py b/registry/vulkan/scripts/cereal/decoder.py
index 6c7ee38c..3e826c90 100644
--- a/registry/vulkan/scripts/cereal/decoder.py
+++ b/registry/vulkan/scripts/cereal/decoder.py
@@ -26,13 +26,8 @@ global_state_prefix = "m_state->on_"
 
 decoder_decl_preamble = """
 
-namespace gfxstream {
-class IOStream;
 class ProcessResources;
-}  // namespace gfxstream
-
-namespace gfxstream {
-namespace vk {
+class IOStream;
 
 class VkDecoder {
 public:
@@ -45,18 +40,14 @@ private:
     class Impl;
     std::unique_ptr<Impl> mImpl;
 };
-
-}  // namespace vk
-}  // namespace gfxstream
-
 """
 
 decoder_impl_preamble ="""
-namespace gfxstream {
-namespace vk {
-
 using android::base::MetricEventBadPacketLength;
 using android::base::MetricEventDuplicateSequenceNum;
+using emugl::vkDispatch;
+
+using namespace goldfish_vk;
 
 class VkDecoder::Impl {
 public:
@@ -113,13 +104,6 @@ size_t VkDecoder::decode(void* buf, size_t bufsize, IOStream* stream,
 // VkDecoder::Impl::decode to follow
 """ % (VULKAN_STREAM_TYPE, VULKAN_STREAM_TYPE)
 
-decoder_impl_postamble = """
-
-}  // namespace vk
-}  // namespace gfxstream
-
-"""
-
 READ_STREAM = "vkReadStream"
 WRITE_STREAM = "vkStream"
 
@@ -913,4 +897,3 @@ size_t VkDecoder::Impl::decode(void* buf, size_t len, IOStream* ioStream,
         self.cgen.stmt("return ptr - (unsigned char*)buf;")
         self.cgen.endBlock() # function body
         self.module.appendImpl(self.cgen.swapCode())
-        self.module.appendImpl(decoder_impl_postamble)
diff --git a/registry/vulkan/scripts/cereal/decodersnapshot.py b/registry/vulkan/scripts/cereal/decodersnapshot.py
index 4ff97a1d..f4dc6d6f 100644
--- a/registry/vulkan/scripts/cereal/decodersnapshot.py
+++ b/registry/vulkan/scripts/cereal/decodersnapshot.py
@@ -39,7 +39,7 @@ private:
 
 decoder_snapshot_impl_preamble ="""
 
-using namespace gfxstream::vk;
+using namespace goldfish_vk;
 using emugl::GfxApiLogger;
 using emugl::HealthMonitor;
 
diff --git a/registry/vulkan/scripts/cereal/encoder.py b/registry/vulkan/scripts/cereal/encoder.py
index d3e39745..108d1228 100644
--- a/registry/vulkan/scripts/cereal/encoder.py
+++ b/registry/vulkan/scripts/cereal/encoder.py
@@ -38,7 +38,7 @@ private:
 
 encoder_impl_preamble ="""
 
-using namespace gfxstream::vk;
+using namespace goldfish_vk;
 
 using android::base::guest::AutoLock;
 using android::base::guest::Lock;
diff --git a/registry/vulkan/scripts/cerealgenerator.py b/registry/vulkan/scripts/cerealgenerator.py
index 988cda45..ad5aab71 100644
--- a/registry/vulkan/scripts/cerealgenerator.py
+++ b/registry/vulkan/scripts/cerealgenerator.py
@@ -325,13 +325,11 @@ using android::base::BumpPool;
         dispatchHeaderDefs = f"""
 {self.hostCommonExtraVulkanHeaders}
 #include "goldfish_vk_private_defs.h"
-namespace gfxstream {{
-namespace vk {{
+namespace goldfish_vk {{
 
 struct VulkanDispatch;
 
-}} // namespace vk
-}} // namespace gfxstream
+}} // namespace goldfish_vk
 using DlOpenFunc = void* (void);
 using DlSymFunc = void* (void*, const char*);
 """
@@ -654,16 +652,8 @@ class BumpPool;
                 autogeneratedHeaderTemplate % \
                 (basename, "(header) generated by %s" % banner_command(sys.argv))
 
-
-        namespaceBegin = """
-namespace gfxstream {
-namespace vk {
-""" if useNamespace else ""
-
-        namespaceEnd = """
-}  // namespace vk"
-}  // namespace gfxstream
-""" if useNamespace else ""
+        namespaceBegin = "namespace goldfish_vk {" if useNamespace else ""
+        namespaceEnd = "} // namespace goldfish_vk" if useNamespace else ""
 
         module.headerPreamble += "#pragma once\n"
         if (not suppressVulkanHeaders):