Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5671dfe0 authored May 04, 2020 by Lorenzo Colitti Committed by Automerger Merge Worker May 04, 2020

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

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

Change-Id: I2c7ebd21043c49b3943f7f122d3660d8087e7553

parents f3746a80 f0d9c040

services/core/Android.bp

+2 −2

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

services/net/Android.bp

+3 −3

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