commit d1f6912398eab22c8fa4114564ccb129c3fda594
author Linux Build Service Account <lnxbuild@localhost> Tue Apr 05 09:50:01 2022 -0700
committer Linux Build Service Account <lnxbuild@localhost> Tue Apr 05 09:50:01 2022 -0700
tree fd8c111196cbfeba43e3a99e2115828696351b6b
parent 2316efd5c8559773d15007020ffe5eb92a78ed8c
parent 1b0e5bfe5b4cba1b0c809648ed3be95d5e8527f7

Merge 1b0e5bfe5b4cba1b0c809648ed3be95d5e8527f7 on remote branch

Change-Id: Ia036296c263cb5744abd6bd55a0b6414be482edb

Android.bp

diff --git a/Android.bp b/Android.bp
index f710f66..900bbfa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -65,7 +65,6 @@
     "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 @@
     "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",

include/lws_config.h

diff --git a/include/lws_config.h b/include/lws_config.h
index 9b87f6b..c8e2dcd 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