[RFCLAT#11] remove libnetd_client_headers and netid_client.h
Removed for reducing the libaray dependency.
MARK_UNSET is going to be removed because the mark doesn't need to be an
argument of cli now. libnetd_client_headers is not required as well.
Bug: 212345928
Test: atest clatd_test
Change-Id: Ia81287dcfa2a48a89187b21d4bc721570c0d1e0f
diff --git a/Android.bp b/Android.bp
index 0eb5298..8d51b49 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,11 +32,6 @@
// Bug: http://b/33566695
"-Wno-address-of-packed-member",
],
-
- // For MARK_UNSET.
- header_libs: [
- "libnetd_client_headers"
- ],
}
// Code used both by the daemon and by unit tests.
diff --git a/clatd.c b/clatd.c
index bb6aedc..f760fef 100644
--- a/clatd.c
+++ b/clatd.c
@@ -39,7 +39,6 @@
#include <sys/capability.h>
#include <sys/uio.h>
-#include <netid_client.h> // For MARK_UNSET.
#include <private/android_filesystem_config.h> // For AID_CLAT.
#include "clatd.h"
diff --git a/main.c b/main.c
index 74fb0c2..46ab20d 100644
--- a/main.c
+++ b/main.c
@@ -25,8 +25,6 @@
#include <sys/capability.h>
#include <unistd.h>
-#include <netid_client.h> // For MARK_UNSET.
-
#include "clatd.h"
#include "common.h"
#include "config.h"
@@ -34,6 +32,10 @@
#define DEVICEPREFIX "v4-"
+// Sync MARK_UNSET from netid_client.h
+// TODO: remove MARK_UNSET definition once argument "-m" is removed.
+#define MARK_UNSET 0u
+
/* function: stop_loop
* signal handler: stop the event loop
*/