commit 93ded738f6c06bf491e3f7e8a9563632b85fb5f9
author Hungming Chen <nuccachen@google.com> Thu Dec 30 20:07:00 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 30 20:07:00 2021 +0000
tree 445934ca65e3044eaea7b772e4bd2c0eb9f8d626
parent b3095f9acb2eb861116a235c630329bcdcca8c37
parent 76002eaeee35d8214a33070a28cba51dbfa14662

[RFCLAT#11] remove libnetd_client_headers and netid_client.h am: 935a5ee67c am: 45feb24fd7 am: 76002eaeee

Original change: https://android-review.googlesource.com/c/platform/external/android-clat/+/1925759

Change-Id: Ibbaa644c7a5b901be441246279e4e1db8df606d7

Android.bp

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.

clatd.c

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"

main.c

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
  */