Merge third_party/libevent from tag 70.0.3538.124

youtube · Jul 29, 2023 · ab69927 · ab69927
2 parents 28460e9 + 2d172a1
commit ab69927
Show file tree

Hide file tree

Showing 22 changed files with 50 additions and 47,863 deletions.
diff --git a/third_party/libevent/BUILD.gn b/third_party/libevent/BUILD.gn
@@ -72,45 +72,46 @@ static_library("libevent") {
     cflags_c = [ "-Wno-unused-function" ]
     public_deps = [ "//starboard/common" ]
   } else {
-    if (is_mac || is_ios) {
-      sources += [
-        "kqueue.c",
-        "mac/config.h",
-        "mac/event-config.h",
-      ]
-      include_dirs = [ "mac" ]
-    } else if (is_linux) {
-      sources += [
-        "epoll.c",
-        "linux/config.h",
-        "linux/event-config.h",
-      ]
-      include_dirs = [ "linux" ]
-    } else if (is_android) {
-      sources += [
-        "android/config.h",
-        "android/event-config.h",
-        "epoll.c",
-      ]
-      include_dirs = [ "android" ]
-    } else if (is_nacl_nonsfi) {
-      sources -= [
-        "evdns.c",
-        "event_tagging.c",
-        "evrpc.c",
-        "http.c",
-        "select.c",
-        "signal.c",
-      ]
-      sources += [
-        "nacl_nonsfi/config.h",
-        "nacl_nonsfi/event-config.h",
-        "nacl_nonsfi/random.c",
-        "nacl_nonsfi/signal_stub.c",
-      ]
-      include_dirs = [ "nacl_nonsfi" ]
-    }
-    configs -= [ "//build/config/compiler:chromium_code" ]
+  if (is_mac || is_ios) {
+    sources += [
+      "kqueue.c",
+      "mac/config.h",
+      "mac/event-config.h",
+    ]
+    include_dirs = [ "mac" ]
+  } else if (is_linux) {
+    sources += [
+      "epoll.c",
+      "linux/config.h",
+      "linux/event-config.h",
+    ]
+    include_dirs = [ "linux" ]
+  } else if (is_android) {
+    sources += [
+      "android/config.h",
+      "android/event-config.h",
+      "epoll.c",
+    ]
+    include_dirs = [ "android" ]
+  } else if (is_nacl_nonsfi) {
+    sources -= [
+      "evdns.c",
+      "event_tagging.c",
+      "evrpc.c",
+      "http.c",
+      "select.c",
+      "signal.c",
+    ]
+    sources += [
+      "nacl_nonsfi/config.h",
+      "nacl_nonsfi/event-config.h",
+      "nacl_nonsfi/random.c",
+      "nacl_nonsfi/signal_stub.c",
+    ]
+    include_dirs = [ "nacl_nonsfi" ]
+  }
+
+  configs -= [ "//build/config/compiler:chromium_code" ]
   }
 
   configs += [ "//build/config/compiler:no_chromium_code" ]

diff --git a/third_party/libevent/METADATA b/third_party/libevent/METADATA
@@ -6,13 +6,15 @@ description:
 third_party {
   url {
     type: GIT
-    value: "https://github.com/libevent/libevent.git"
+    value: "https://chromium.googlesource.com/chromium/src"
+    # Chromium probably uses https://github.com/libevent/libevent but see README.chromium.
   }
-  version: "3e9aad72214519ac2ad6f5f023af48136d0dd50d"
+  version: "70.0.3538.124"
+  # This is "Version: 1.4.15" according to README.chromium.
   last_upgrade_date {
-    year: 2015
-    month: 1
-    day: 5
+    year: 2023
+    month: 7
+    day: 29
   }
   license_type: NOTICE
 }