diff options
| -rw-r--r-- | services/core/Android.bp | 4 | ||||
| -rw-r--r-- | services/net/Android.bp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/services/core/Android.bp b/services/core/Android.bp index 77773edc28ca..181ce8958992 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -127,8 +127,8 @@ java_library_static { "android.hardware.soundtrigger-V2.3-java", "android.hidl.manager-V1.2-java", "capture_state_listener-aidl-java", - "dnsresolver_aidl_interface-V4-java", - "netd_event_listener_interface-java", + "dnsresolver_aidl_interface-java", + "netd_aidl_interfaces-platform-java", "overlayable_policy_aidl-java", ], } diff --git a/services/net/Android.bp b/services/net/Android.bp index bb5409b3e032..8b444b0fed41 100644 --- a/services/net/Android.bp +++ b/services/net/Android.bp @@ -12,8 +12,7 @@ java_library_static { ":services.net-sources", ], static_libs: [ - "dnsresolver_aidl_interface-V4-java", - "netd_aidl_interface-V3-java", + "netd_aidl_interfaces-platform-java", "netlink-client", "networkstack-client", "net-utils-services-common", @@ -44,7 +43,8 @@ java_library { "framework-wifi-util-lib", ], static_libs: [ - "dnsresolver_aidl_interface-V2-java", + // All the classes in netd_aidl_interface must be jarjar so they do not conflict with the + // classes generated by netd_aidl_interfaces-platform-java above. "netd_aidl_interface-V3-java", "netlink-client", "networkstack-client", |