virtio-gpu-gfxstream-renderer.h: nuke GfxStreamBackendInitOverride am: 2e516b6b6c am: d7d103fc53 am: 5126e669cd am: 17973effd6

Original change: https://android-review.googlesource.com/c/device/generic/vulkan-cereal/+/2537074

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

5 files changed, 2 insertions, 29 deletions

diff --git a/stream-servers/Android.bp b/stream-servers/Android.bp
index 6d9636dd..044653d1 100644
--- a/stream-servers/Android.bp
+++ b/stream-servers/Android.bp
@@ -82,7 +82,6 @@ cc_library_shared {
         "FrameBuffer.cpp",
         "GfxStreamAgents.cpp",
         "virtio-gpu-gfxstream-renderer.cpp",
-        "GfxStreamBackendInitOverride.cpp",
         "VirtioGpuTimelines.cpp",
         "VsyncThread.cpp",
     ],
diff --git a/stream-servers/CMakeLists.txt b/stream-servers/CMakeLists.txt
index f963f0c6..4e6e97a6 100644
--- a/stream-servers/CMakeLists.txt
+++ b/stream-servers/CMakeLists.txt
@@ -92,25 +92,6 @@ if (WIN32)
     target_link_libraries(gfxstream_backend_static PRIVATE D3d9.lib)
 endif()
 
-if(NOT TARGET gfxstream_backend.init-product-override)
-    add_library(gfxstream_backend.init-product-override OBJECT GfxStreamBackendInitOverride.cpp)
-    target_include_directories(
-        gfxstream_backend.init-product-override
-        PRIVATE
-        ${GFXSTREAM_REPO_ROOT}
-        ${GFXSTREAM_REPO_ROOT}/include
-        ${GFXSTREAM_REPO_ROOT}/stream-servers
-        ${GFXSTREAM_REPO_ROOT}/stream-servers/vulkan
-        ${GFXSTREAM_REPO_ROOT}/stream-servers/vulkan/cereal
-        ${GFXSTREAM_REPO_ROOT}/stream-servers/apigen-codec-common
-        ${GFXSTREAM_REPO_ROOT}/third-party/glm/include)
-    target_link_libraries(
-        gfxstream_backend.init-product-override
-        PRIVATE
-        gfxstream_vulkan_headers
-        aemu-base.headers)
-endif()
-
 # Suppress some warnings generated by platform/aemu repo
 target_compile_options(
     gfxstream_backend_static
@@ -131,7 +112,7 @@ target_link_libraries(
     PUBLIC
     gfxstream_backend_static
     PRIVATE
-    gfxstream_backend.init-product-override)
+    )
 
 if(BUILD_STANDALONE)
     target_link_libraries(gfxstream_backend
diff --git a/stream-servers/GfxStreamBackendInitOverride.cpp b/stream-servers/GfxStreamBackendInitOverride.cpp
index 0b7d0dca..dfcca142 100644
--- a/stream-servers/GfxStreamBackendInitOverride.cpp
+++ b/stream-servers/GfxStreamBackendInitOverride.cpp
@@ -14,4 +14,4 @@
 
 #include "virtio-gpu-gfxstream-renderer.h"
 
-void gfxstream_backend_init_product_override() {}
\ No newline at end of file
+void gfxstream_backend_init_product_override() {}
diff --git a/stream-servers/virtio-gpu-gfxstream-renderer.cpp b/stream-servers/virtio-gpu-gfxstream-renderer.cpp
index f8dcb045..ced24fea 100644
--- a/stream-servers/virtio-gpu-gfxstream-renderer.cpp
+++ b/stream-servers/virtio-gpu-gfxstream-renderer.cpp
@@ -2223,9 +2223,6 @@ VG_EXPORT int stream_renderer_init(struct stream_renderer_param* stream_renderer
                         fb->logVulkanOutOfMemory(result, function, line, allocationSize);
                     }}));
 
-    gfxstream_backend_init_product_override();
-    // First we make some agents available.
-
     GFXS_LOG("start. display dimensions: width %u height %u, renderer flags: 0x%x", display_width,
              display_height, renderer_flags);
 
diff --git a/stream-servers/virtio-gpu-gfxstream-renderer.h b/stream-servers/virtio-gpu-gfxstream-renderer.h
index f75fdbe4..91091c80 100644
--- a/stream-servers/virtio-gpu-gfxstream-renderer.h
+++ b/stream-servers/virtio-gpu-gfxstream-renderer.h
@@ -292,10 +292,6 @@ VG_EXPORT void gfxstream_backend_teardown(void);
 // if bufSize is less or equal the render string length, only bufSize-1 char copied.
 VG_EXPORT void gfxstream_backend_getrender(char* buf, size_t bufSize, size_t* size);
 
-// A customization point that allows the downstream to call their own functions when
-// gfxstream_backend_init is called.
-void gfxstream_backend_init_product_override();
-
 #else
 
 #define VG_EXPORT