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

Commit ef6b675a authored Dec 09, 2018 by Luke Huang Committed by android-build-merger Dec 09, 2018

Merge "Migrate INetd to stable aidl"

am: 9677dde1

Change-Id: If2b5208206e2e58b12e0274fab85809685402496

parents 7c580212 9677dde1

Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -599,7 +599,6 @@ java_defaults {
		":libupdate_engine_aidl",

		":storaged_aidl",
		":netd_aidl",
		":vold_aidl",
		":installd_aidl",
		":dumpstate_aidl",

services/core/Android.bp

+0 −1

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

services/tests/servicestests/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,10 +66,10 @@ android_test {
		"liblog",
		"liblzma",
		"libnativehelper",
		"libnetdaidl",
		"libui",
		"libunwind",
		"libutils",
		"netd_aidl_interface-cpp",
		],

		dxflags: ["--multi-dex"],

services/tests/uiservicestests/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,9 +50,9 @@ android_test {
		"liblog",
		"liblzma",
		"libnativehelper",
		"libnetdaidl",
		"libui",
		"libunwind",
		"libutils",
		"netd_aidl_interface-cpp",
		],
		}

tests/net/Android.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -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 := \