diff options
| author | 2018-12-10 03:00:58 -0800 | |
|---|---|---|
| committer | 2018-12-10 03:00:58 -0800 | |
| commit | e405415a6253bd53d3fd813e49bb1f41b5181ab8 (patch) | |
| tree | 29698336b8bd5b74f384a6da4f9cb5131625f7a6 | |
| parent | aa62d2fff61d6f6237d394e38ad37805009d6aea (diff) | |
| parent | c2126e2008d0d0fe9c6b7b70fe33635841197b0d (diff) | |
Merge "Migrate INetd to stable aidl" am: 9677dde14a am: ef6b675a8c
am: c2126e2008
Change-Id: I9866b431cd5ddeb318e164fc2a897537a3a7a88d
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | services/core/Android.bp | 1 | ||||
| -rw-r--r-- | services/tests/servicestests/Android.bp | 2 | ||||
| -rw-r--r-- | services/tests/uiservicestests/Android.bp | 2 | ||||
| -rw-r--r-- | tests/net/Android.mk | 2 |
5 files changed, 2 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp index 2ae7d6c1a0a4..b3d3dd2fef62 100644 --- a/Android.bp +++ b/Android.bp @@ -633,7 +633,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 70b833985e0f..cccacf4bf837 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -21,7 +21,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 e80434224633..d49e78a20db5 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -69,10 +69,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 ca8cc0d89201..7a5eaa852c34 100644 --- a/services/tests/uiservicestests/Android.bp +++ b/services/tests/uiservicestests/Android.bp @@ -50,9 +50,9 @@ android_test { "liblog", "liblzma", "libnativehelper", - "libnetdaidl", "libui", "libunwindstack", "libutils", + "netd_aidl_interface-cpp", ], } diff --git a/tests/net/Android.mk b/tests/net/Android.mk index 132135dc89bc..9d1edbf1eaf0 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 := \ |