diff options
| author | Luke Huang <huangluke@google.com> | 2018-12-10 03:07:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-10 03:07:08 +0000 |
| commit | 9677dde14a171d23959a12adad33e1bb96bce46c (patch) | |
| tree | 23dcae2274a99adfc47dfddb1c006c3c2fa6b7f9 | |
| parent | 422fa22456596f5deb5c1f7851c8ddb49c834ade (diff) | |
| parent | 734c4cea3ce2d493a6d3a295d880a66cb4b8a30b (diff) | |
Merge "Migrate INetd to stable aidl"
| -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 8023fc5dcaf9..8b8139ed16a7 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 19164e53de04..43469fff3088 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 225df5ca96af..af8596de451a 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 9b414f1eb24a..b0222b86e976 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 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 := \ |