From 734c4cea3ce2d493a6d3a295d880a66cb4b8a30b Mon Sep 17 00:00:00 2001
From: Luke Huang <huangluke@google.com>
Date: Fri, 23 Nov 2018 17:19:22 +0800
Subject: [PATCH] Migrate INetd to stable aidl

Del the linking of old lib file and add new one.

Test: runtest frameworks-net passes
Change-Id: I7258f7c51718ff5f07e7bfe301b6c5f242b9da5a
---
 Android.bp                                | 1 -
 services/core/Android.bp                  | 1 -
 services/tests/servicestests/Android.bp   | 2 +-
 services/tests/uiservicestests/Android.bp | 2 +-
 tests/net/Android.mk                      | 2 --
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Android.bp b/Android.bp
index 8f300729d7101..7edabbb7c3f1c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -599,7 +599,6 @@ java_defaults {
         ":libupdate_engine_aidl",
 
         ":storaged_aidl",
-        ":netd_aidl",
         ":vold_aidl",
         ":installd_aidl",
         ":dumpstate_aidl",
diff --git a/services/core/Android.bp b/services/core/Android.bp
index 19164e53de045..43469fff3088e 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -19,7 +19,6 @@ java_library_static {
         ":mediaupdateservice_aidl",
         "java/com/android/server/EventLogTags.logtags",
         "java/com/android/server/am/EventLogTags.logtags",
-        ":netd_aidl",
         ":netd_metrics_aidl",
     ],
 
diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp
index 225df5ca96af2..af8596de451af 100644
--- a/services/tests/servicestests/Android.bp
+++ b/services/tests/servicestests/Android.bp
@@ -66,10 +66,10 @@ android_test {
         "liblog",
         "liblzma",
         "libnativehelper",
-        "libnetdaidl",
         "libui",
         "libunwind",
         "libutils",
+        "netd_aidl_interface-cpp",
     ],
 
     dxflags: ["--multi-dex"],
diff --git a/services/tests/uiservicestests/Android.bp b/services/tests/uiservicestests/Android.bp
index 9b414f1eb24af..b0222b86e9764 100644
--- a/services/tests/uiservicestests/Android.bp
+++ b/services/tests/uiservicestests/Android.bp
@@ -50,9 +50,9 @@ android_test {
         "liblog",
         "liblzma",
         "libnativehelper",
-        "libnetdaidl",
         "libui",
         "libunwind",
         "libutils",
+        "netd_aidl_interface-cpp",
     ],
 }
diff --git a/tests/net/Android.mk b/tests/net/Android.mk
index 132135dc89bcb..9d1edbf1eaf08 100644
--- a/tests/net/Android.mk
+++ b/tests/net/Android.mk
@@ -51,7 +51,6 @@ LOCAL_JNI_SHARED_LIBRARIES := \
     liblog \
     liblzma \
     libnativehelper \
-    libnetdaidl \
     libpackagelistparser \
     libpcre2 \
     libselinux \
@@ -93,7 +92,6 @@ LOCAL_SHARED_LIBRARIES := \
   liblog \
   libcutils \
   libnativehelper \
-  libnetdaidl \
   netd_aidl_interface-cpp
 
 LOCAL_STATIC_LIBRARIES := \