From 6bd7b5cc3746b292c3735f82abbd5bed36275586 Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <jani@igalia.com>
Date: Mon, 22 Apr 2024 17:57:44 +0300
Subject: [PATCH] Fix mistakenly added interface definitions

---
 src/interfaces.h   | 35 +----------------------------------
 src/ipc-messages.h | 31 -------------------------------
 2 files changed, 1 insertion(+), 65 deletions(-)

diff --git a/src/interfaces.h b/src/interfaces.h
index ed405a9..e07dd31 100644
--- a/src/interfaces.h
+++ b/src/interfaces.h
@@ -16,40 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <wpe/wpe.h>
-
-#include "interfaces.h"
-#include "logging.h"
-#include <cstring>
-
-extern "C" {
-
-__attribute__((visibility("default")))
-struct wpe_loader_interface _wpe_loader_interface = {
-    [] (const char* object_name) -> void* {
-        ALOGD("_wpe_loader_interface queried for object_name %s", object_name);
-
-        if (!std::strcmp(object_name, "_wpe_renderer_host_interface"))
-            return &android_renderer_host_impl;
-
-        if (!std::strcmp(object_name, "_wpe_renderer_backend_egl_interface"))
-            return &android_renderer_backend_egl_impl;
-
-        if (!std::strcmp(object_name, "_wpe_renderer_backend_egl_target_interface"))
-            return &android_renderer_backend_egl_target_impl;
-
-        if (!std::strcmp(object_name, "_wpe_renderer_backend_egl_offscreen_target_interface"))
-            return &android_renderer_backend_egl_offscreen_target_impl;
-
-        return nullptr;
-    },
-};
-
-}
-
-
-#include <wpe/wpe.h>
-#include <wpe/wpe-egl.h>
+#pragma once
 
 extern struct wpe_renderer_host_interface android_renderer_host_impl;
 
diff --git a/src/ipc-messages.h b/src/ipc-messages.h
index 9eb29d1..4f0c939 100644
--- a/src/ipc-messages.h
+++ b/src/ipc-messages.h
@@ -16,37 +16,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <wpe/wpe.h>
-
-#include "interfaces.h"
-#include "logging.h"
-#include <cstring>
-
-extern "C" {
-
-__attribute__((visibility("default")))
-struct wpe_loader_interface _wpe_loader_interface = {
-    [] (const char* object_name) -> void* {
-        ALOGD("_wpe_loader_interface queried for object_name %s", object_name);
-
-        if (!std::strcmp(object_name, "_wpe_renderer_host_interface"))
-            return &android_renderer_host_impl;
-
-        if (!std::strcmp(object_name, "_wpe_renderer_backend_egl_interface"))
-            return &android_renderer_backend_egl_impl;
-
-        if (!std::strcmp(object_name, "_wpe_renderer_backend_egl_target_interface"))
-            return &android_renderer_backend_egl_target_impl;
-
-        if (!std::strcmp(object_name, "_wpe_renderer_backend_egl_offscreen_target_interface"))
-            return &android_renderer_backend_egl_offscreen_target_impl;
-
-        return nullptr;
-    },
-};
-
-}
-
 #pragma once
 
 namespace IPC {