aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge E. Moreira <jemoreira@google.com>2022-02-08 19:52:43 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-02-08 19:52:43 +0000
commit22f5bec4f9e83a4a353e6a1f2afa291b572a5299 (patch)
treefd8c111196cbfeba43e3a99e2115828696351b6b
parent1766b1b2a0c615108cb41a5bd5c5c6f6e4462e68 (diff)
parent5840a27d8e3cb3a4a902081f68986f4a59d92aa2 (diff)
downloadlibwebsockets-22f5bec4f9e83a4a353e6a1f2afa291b572a5299.tar.gz
Don't use netlink am: ba7e6c3989 am: 23427d59a1 am: 2dd806c08b am: 5840a27d8e
Original change: https://android-review.googlesource.com/c/platform/external/libwebsockets/+/1975251 Change-Id: I68a629e1a88efa3ddf41e046a27366b9eeda9cd4
-rw-r--r--Android.bp2
-rw-r--r--include/lws_config.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index f710f66e..900bbfaa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,7 +65,6 @@ libwebsocketsSrcFiles = [
"lib/core-net/network.c",
"lib/core-net/output.c",
"lib/core-net/pollfd.c",
- "lib/core-net/route.c",
"lib/core-net/service.c",
"lib/core-net/sorted-usec-list.c",
"lib/core-net/state.c",
@@ -113,7 +112,6 @@ libwebsocketsSrcFiles = [
"lib/roles/http/server/lws-spa.c",
"lib/roles/http/server/server.c",
"lib/roles/listen/ops-listen.c",
- "lib/roles/netlink/ops-netlink.c",
"lib/roles/pipe/ops-pipe.c",
"lib/roles/raw-file/ops-raw-file.c",
"lib/roles/raw-skt/ops-raw-skt.c",
diff --git a/include/lws_config.h b/include/lws_config.h
index 9b87f6b7..c8e2dcd4 100644
--- a/include/lws_config.h
+++ b/include/lws_config.h
@@ -181,7 +181,7 @@
#define LWS_LOGS_TIMESTAMP
/* #undef LWS_WITH_MBEDTLS */
/* #undef LWS_WITH_MINIZ */
-#define LWS_WITH_NETLINK
+/* #undef LWS_WITH_NETLINK */
#define LWS_WITH_NETWORK
/* #undef LWS_WITH_NO_LOGS */
#define LWS_WITH_CACHE_NSCOOKIEJAR