registry/libevent: Fix android include and rename

Signed-off-by: Ryan Northey <ryan@synca.io>

Author: phlax

…t/release-2.2.2-alpha.envoy/MODULE.bazel …/libevent/2.2.2-alpha.envoy/MODULE.bazelmodules/libevent/release-2.2.2-alpha.envoy/MODULE.bazel renamed to modules/libevent/2.2.2-alpha.envoy/MODULE.bazel modules/libevent/release-2.2.2-alpha.envoy/MODULE.bazel renamed to modules/libevent/2.2.2-alpha.envoy/MODULE.bazel

@@ -1,6 +1,6 @@
 module(
     name = "libevent",
-    version = "release-2.2.2-alpha.envoy",
+    version = "2.2.2-alpha.envoy",
     compatibility_level = 1,
     bazel_compatibility = [">=7.2.1"],
 )

…se-2.2.2-alpha.envoy/overlay/BUILD.bazel …nt/2.2.2-alpha.envoy/overlay/BUILD.bazelmodules/libevent/release-2.2.2-alpha.envoy/overlay/BUILD.bazel renamed to modules/libevent/2.2.2-alpha.envoy/overlay/BUILD.bazel modules/libevent/release-2.2.2-alpha.envoy/overlay/BUILD.bazel renamed to modules/libevent/2.2.2-alpha.envoy/overlay/BUILD.bazel

@@ -55,9 +55,11 @@ cc_library(
         "epolltable-internal.h",
         "evbuffer-internal.h",
         "evconfig-private.h",
+        "evconfig-private_android.h",
         "evconfig-private_apple.h",
         "evconfig-private_linux.h",
         "event-internal.h",
+        "event2-config_android.h",
         "event2-config_apple.h",
         "event2-config_common.h",
         "event2-config_linux.h",
@@ -76,7 +78,12 @@ cc_library(
         "strlcpy-internal.h",
         "time-internal.h",
         "util-internal.h",
-    ],
+    ] + select({
+        "@platforms//os:windows": [
+            "wepoll.h",
+        ],
+        "//conditions:default": [],
+    }),
     visibility = [":__subpackages__"],
 )
 
@@ -115,7 +122,6 @@ cc_library(
         "devpoll.c",
         "epoll.c",
         "event.c",
-        "event_tagging.c",
         "evmap.c",
         "evport.c",
         "evthread.c",
@@ -131,11 +137,16 @@ cc_library(
         "strlcpy.c",
         "watch.c",
     ] + select({
+        "@platforms//os:linux": ["signalfd.c"],
+        "@platforms//os:android": ["signalfd.c"],
+        "//conditions:default": [],
+    }) + select({
         "@platforms//os:windows": [
             "buffer_iocp.c",
             "bufferevent_async.c",
             "event_iocp.c",
             "evthread_win32.c",
+            "wepoll.c",
             "win32select.c",
         ],
         "//conditions:default": [],
@@ -171,8 +182,10 @@ cc_library(
 cc_library(
     name = "event_extra_private_headers",
     hdrs = [
+        "evdns-internal.h",
         "evrpc-internal.h",
         "http-internal.h",
+        "sha1.h",
     ],
     visibility = [":__subpackages__"],
 )
@@ -188,6 +201,7 @@ EVENT_EXTRA_PUBLIC_HEADERS = [
     "include/event2/rpc.h",
     "include/event2/rpc_compat.h",
     "include/event2/rpc_struct.h",
+    "include/event2/ws.h",
     "include/evhttp.h",
     "include/evrpc.h",
 ]
@@ -196,8 +210,15 @@ cc_library(
     name = "event_extra",
     srcs = [
         "evdns.c",
+        "event_tagging.c",
         "evrpc.c",
         "http.c",
+        # sha1.c derives endianness from BYTE_ORDER, which it obtains via
+        # EVENT__HAVE_ENDIAN_H / EVENT__HAVE_SYS_ENDIAN_H from the config
+        # headers.  All supported platforms set at least one of those macros,
+        # so no per-target byte-order copt is required here.
+        "sha1.c",
+        "ws.c",
     ],
     hdrs = EVENT_EXTRA_PUBLIC_HEADERS,
     includes = ["include"],
@@ -213,12 +234,8 @@ cc_library(
         ":event_core",
         ":event_core_private_headers",
         ":event_extra_private_headers",
-    ] + select({
-        "@platforms//os:windows": [
-            "//compat",
-        ],
-        "//conditions:default": [],
-    }),
+        "//compat",
+    ],
 )
 
 cc_library(
@@ -229,16 +246,17 @@ cc_library(
         ":event_core",
         ":event_extra",
     ] + select({
-        "@platforms//os:linux": [":event_pthreads"],
-        "@platforms//os:macos": [":event_pthreads"],
-        "//conditions:default": [],
+        "@platforms//os:windows": [],
+        "//conditions:default": [":event_pthreads"],
     }),
 )
 
 cc_library(
     name = "event_openssl_private_headers",
     hdrs = [
+        "mbedtls-compat.h",
         "openssl-compat.h",
+        "ssl-compat.h",
     ],
     tags = [
         "requires_openssl",
@@ -256,6 +274,7 @@ cc_library(
     name = "event_openssl",
     srcs = [
         "bufferevent_openssl.c",
+        "bufferevent_ssl.c",
     ],
     includes = ["include"],
     tags = [
@@ -274,15 +293,13 @@ cc_library(
 cc_library(
     name = "event_pthreads",
     srcs = select({
-        "@platforms//os:linux": ["evthread_pthread.c"],
-        "@platforms//os:macos": ["evthread_pthread.c"],
-        "//conditions:default": [],
+        "@platforms//os:windows": [],
+        "//conditions:default": ["evthread_pthread.c"],
     }),
     includes = ["include"],
     linkopts = select({
-        "@platforms//os:linux": ["-pthread"],
-        "@platforms//os:macos": ["-pthread"],
-        "//conditions:default": [],
+        "@platforms//os:windows": [],
+        "//conditions:default": ["-pthread"],
     }),
     visibility = ["//visibility:public"],
     deps = [

…pha.envoy/overlay/WIN32-Code/BUILD.bazel …pha.envoy/overlay/WIN32-Code/BUILD.bazelmodules/libevent/release-2.2.2-alpha.envoy/overlay/WIN32-Code/BUILD.bazel renamed to modules/libevent/2.2.2-alpha.envoy/overlay/WIN32-Code/BUILD.bazel modules/libevent/release-2.2.2-alpha.envoy/overlay/WIN32-Code/BUILD.bazel renamed to modules/libevent/2.2.2-alpha.envoy/overlay/WIN32-Code/BUILD.bazel

@@ -8,6 +8,7 @@ cc_library(
     name = "compat",
     hdrs = [
         "sys/queue.h",
+        "sys/tree.h",
     ],
     includes = ["."],
 )

…2-alpha.envoy/overlay/compat/BUILD.bazel …2-alpha.envoy/overlay/compat/BUILD.bazelmodules/libevent/release-2.2.2-alpha.envoy/overlay/compat/BUILD.bazel renamed to modules/libevent/2.2.2-alpha.envoy/overlay/compat/BUILD.bazel modules/libevent/release-2.2.2-alpha.envoy/overlay/compat/BUILD.bazel renamed to modules/libevent/2.2.2-alpha.envoy/overlay/compat/BUILD.bazel

@@ -1,7 +1,9 @@
 #ifndef EVCONFIG_PRIVATE_H_INCLUDED_
 #define EVCONFIG_PRIVATE_H_INCLUDED_
 
-#if defined(__linux__)
+#if defined(__ANDROID__)
+#include "evconfig-private_android.h"
+#elif defined(__linux__)
 #include "evconfig-private_linux.h"
 #elif defined(__APPLE__)
 #include "evconfig-private_apple.h"

…2-alpha.envoy/overlay/evconfig-private.h …2-alpha.envoy/overlay/evconfig-private.hmodules/libevent/release-2.2.2-alpha.envoy/overlay/evconfig-private.h renamed to modules/libevent/2.2.2-alpha.envoy/overlay/evconfig-private.h modules/libevent/release-2.2.2-alpha.envoy/overlay/evconfig-private.h renamed to modules/libevent/2.2.2-alpha.envoy/overlay/evconfig-private.h

@@ -0,0 +1,8 @@
+
+#ifndef EVCONFIG_PRIVATE_ANDROID_H_INCLUDED_
+#define EVCONFIG_PRIVATE_ANDROID_H_INCLUDED_
+
+/* Android is Linux-based; the private config is identical. */
+#include "evconfig-private_linux.h"
+
+#endif  // EVCONFIG_PRIVATE_ANDROID_H_INCLUDED_