Commit d7e41fd7 authored Apr 06, 2021 by Steven Moreland Committed by Automerger Merge Worker Apr 06, 2021

Merge "libbinder: add libactivitymanager_aidl" am: 5e7768d7 am: d778b905...

Merge "libbinder: add libactivitymanager_aidl" am: 5e7768d7 am: d778b905 am: 853dc283 am: f851daf8

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1664326

Change-Id: I8b4e285308c92861fb58a8e259c26e88c488545a

libs/binder/Android.bp

+11 −0

Original line number	Diff line number	Diff line
		@@ -293,3 +293,14 @@ cc_library {
		"liblog",
		],
		}

		// TODO(b/183654927): initially empty lib to work around some merge conflicts
		cc_library {
		name: "libactivitymanager_aidl",
		srcs: [],
		shared_libs: [
		"libbinder",
		"libutils",
		"liblog",
		],
		}