Merge "Migrate INetd to stable aidl" am: 9677dde14a

am: ef6b675a8c Change-Id: I326e91ba97b77f0b62b372dd8bddc7bca77e41d7
2018-12-09 19:27:33 -08:00
parent 5709582a94 ef6b675a8c
commit c2126e2008
5 changed files with 2 additions and 6 deletions
--- 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",
--- 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",
    ],

--- 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"],
--- 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",
    ],
 }
--- 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 := \