From 0cc243a8cc96d1bbc274691f6a29656830a59bb1 Mon Sep 17 00:00:00 2001
From: Harshit Malpani <harshit.malpani@espressif.com>
Date: Mon, 13 Mar 2023 10:43:34 +0530
Subject: [PATCH] esp_http_client: remove dependency of esp_stubs from
 esp_http_client. Add esp_event stubs in `linux` component

---
 components/esp_http_client/CMakeLists.txt      |  2 +-
 components/linux/CMakeLists.txt                |  3 ++-
 components/linux/esp_event_stubs.c             | 18 ++++++++++++++++++
 .../linux_stubs/esp_stubs/esp_stubs.c          | 11 -----------
 .../linux_stubs/esp_stubs/include/esp_event.h  |  9 ---------
 5 files changed, 21 insertions(+), 22 deletions(-)
 create mode 100644 components/linux/esp_event_stubs.c

diff --git a/components/esp_http_client/CMakeLists.txt b/components/esp_http_client/CMakeLists.txt
index cd2361398e..59fd0e5763 100644
--- a/components/esp_http_client/CMakeLists.txt
+++ b/components/esp_http_client/CMakeLists.txt
@@ -1,7 +1,7 @@
 if(NOT ${IDF_TARGET} STREQUAL "linux")
     set(req lwip esp_event)
 else()
-    set(req esp_stubs)
+    set(req linux)
 endif()
 
 idf_component_register(SRCS "esp_http_client.c"
diff --git a/components/linux/CMakeLists.txt b/components/linux/CMakeLists.txt
index b7d2bd46a7..01594e97f4 100644
--- a/components/linux/CMakeLists.txt
+++ b/components/linux/CMakeLists.txt
@@ -3,5 +3,6 @@ if(NOT "${target}" STREQUAL "linux")
     return()
 endif()
 
-idf_component_register(INCLUDE_DIRS include
+idf_component_register(SRCS esp_event_stubs.c
+                       INCLUDE_DIRS include ${IDF_PATH}/components/esp_event/include
                        REQUIRED_IDF_TARGETS linux)
diff --git a/components/linux/esp_event_stubs.c b/components/linux/esp_event_stubs.c
new file mode 100644
index 0000000000..2b622678e0
--- /dev/null
+++ b/components/linux/esp_event_stubs.c
@@ -0,0 +1,18 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include "esp_err.h"
+#include "esp_event.h"
+
+esp_err_t esp_event_loop_create_default(void)
+{
+    return ESP_OK;
+}
+
+esp_err_t esp_event_post(esp_event_base_t event_base, int32_t event_id,
+        const void* event_data, size_t event_data_size, TickType_t ticks_to_wait)
+{
+    return ESP_OK;
+}
diff --git a/examples/protocols/linux_stubs/esp_stubs/esp_stubs.c b/examples/protocols/linux_stubs/esp_stubs/esp_stubs.c
index 18bc472a15..989162f74e 100644
--- a/examples/protocols/linux_stubs/esp_stubs/esp_stubs.c
+++ b/examples/protocols/linux_stubs/esp_stubs/esp_stubs.c
@@ -10,17 +10,6 @@
 
 extern void app_main(void);
 
-esp_err_t esp_event_loop_create_default(void)
-{
-    return ESP_OK;
-}
-
-esp_err_t esp_event_post(esp_event_base_t event_base, int32_t event_id,
-        const void* event_data, size_t event_data_size, TickType_t ticks_to_wait)
-{
-    return ESP_OK;
-}
-
 esp_err_t esp_netif_init(void)
 {
     return ESP_OK;
diff --git a/examples/protocols/linux_stubs/esp_stubs/include/esp_event.h b/examples/protocols/linux_stubs/esp_stubs/include/esp_event.h
index 9eaa0e6db6..e909e800f6 100644
--- a/examples/protocols/linux_stubs/esp_stubs/include/esp_event.h
+++ b/examples/protocols/linux_stubs/esp_stubs/include/esp_event.h
@@ -5,13 +5,4 @@
  */
 #include "esp_err.h"
 
-typedef const char*  esp_event_base_t; /**< unique pointer to a subsystem that exposes events */
-typedef unsigned long TickType_t;
-
-#define ESP_EVENT_DECLARE_BASE(id) extern esp_event_base_t id
-#define ESP_EVENT_DEFINE_BASE(id) esp_event_base_t id = #id
-
 esp_err_t esp_event_loop_create_default(void);
-
-esp_err_t esp_event_post(esp_event_base_t event_base, int32_t event_id,
-        const void* event_data, size_t event_data_size, TickType_t ticks_to_wait);