Merge "Only depend on the latest stable netd AIDL." into rvc-dev am: cb7f8e7280 am: a0314e6abc (6a59803f) · Commits · e / os / android_frameworks_base

services/core/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -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",
		],
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -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",