Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only depend on the latest stable netd AIDL." into rvc-dev am: cb7f8e7280

Browse Source 
Change-Id: Iac5918f7bf94b708d6b50b10310f7d6f629af8c5
This commit is contained in:
Lorenzo Colitti
2020-05-04 04:54:13 +00:00
committed by Automerger Merge Worker
parent 999b9558aa cb7f8e7280
commit a0314e6abc
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/Android.bp
View File

@@ -127,8 +127,8 @@ java_library_static {
"android.hardware.soundtrigger-V2.3-java", "android.hardware.soundtrigger-V2.3-java",
"android.hidl.manager-V1.2-java", "android.hidl.manager-V1.2-java",
"capture_state_listener-aidl-java", "capture_state_listener-aidl-java",
"dnsresolver_aidl_interface-V4-java", "dnsresolver_aidl_interface-java",
"netd_event_listener_interface-java", "netd_aidl_interfaces-platform-java",
"overlayable_policy_aidl-java", "overlayable_policy_aidl-java",
], ],
} }

6
services/net/Android.bp
View File

@@ -12,8 +12,7 @@ java_library_static {
":services.net-sources", ":services.net-sources",
], ],
static_libs: [ static_libs: [
"dnsresolver_aidl_interface-V4-java", "netd_aidl_interfaces-platform-java",
"netd_aidl_interface-V3-java",
"netlink-client", "netlink-client",
"networkstack-client", "networkstack-client",
"net-utils-services-common", "net-utils-services-common",
@@ -44,7 +43,8 @@ java_library {
"framework-wifi-util-lib", "framework-wifi-util-lib",
], ],
static_libs: [ 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", "netd_aidl_interface-V3-java",
"netlink-client", "netlink-client",
"networkstack-client", "networkstack-client",