Merge "libbinder: split out activitymanager" (84159ae8) · Commits · e / os / android_frameworks_native

libs/binder/Android.bp

+11 −6

Original line number	Original line	Diff line number	Diff line
	@@ -60,16 +60,13 @@ cc_library_headers {
	// Currently, these are only on system android (not vendor, not host)		// Currently, these are only on system android (not vendor, not host)
	// TODO(b/183654927) - move these into separate libraries		// TODO(b/183654927) - move these into separate libraries
	libbinder_device_interface_sources = [		libbinder_device_interface_sources = [
	"ActivityManager.cpp",
	"AppOpsManager.cpp",		"AppOpsManager.cpp",
	"IActivityManager.cpp",
	"IAppOpsCallback.cpp",		"IAppOpsCallback.cpp",
	"IAppOpsService.cpp",		"IAppOpsService.cpp",

	"IPermissionController.cpp",		"IPermissionController.cpp",
	"IUidObserver.cpp",
	"PermissionCache.cpp",		"PermissionCache.cpp",
	"PermissionController.cpp",		"PermissionController.cpp",
	":activity_manager_procstate_aidl",
	]		]

	cc_library {		cc_library {
	@@ -297,13 +294,21 @@ cc_library {
	],		],
	}		}

	// TODO(b/183654927): initially empty lib to work around some merge conflicts
	cc_library {		cc_library {
	name: "libactivitymanager_aidl",		name: "libactivitymanager_aidl",
	srcs: [],		srcs: [
			"ActivityManager.cpp",
			"IActivityManager.cpp",
			"IUidObserver.cpp",
			":activity_manager_procstate_aidl",
			],
			export_include_dirs: ["include_activitymanager"],
	shared_libs: [		shared_libs: [
	"libbinder",		"libbinder",
	"libutils",		"libutils",
	"liblog",		"liblog",
	],		],
			aidl: {
			export_aidl_headers: true,
			},
	}		}

+0 −0

File moved.

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -18,8 +18,8 @@

	#ifndef __ANDROID_VNDK__		#ifndef __ANDROID_VNDK__

	#include <binder/IInterface.h>
	#include <binder/IUidObserver.h>		#include <binder/IUidObserver.h>
			#include <binder/IInterface.h>

	namespace android {		namespace android {

+0 −0

File moved.

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -49,6 +49,7 @@ cc_library_shared {
	"libhardware_legacy",		"libhardware_legacy",
	"libutils",		"libutils",
	"liblog",		"liblog",
			"libactivitymanager_aidl",
	"libbatterystats_aidl",		"libbatterystats_aidl",
	"libbinder",		"libbinder",
	"libsensor",		"libsensor",
	@@ -69,8 +70,11 @@ cc_library_shared {

	generated_headers: ["framework-cppstream-protos"],		generated_headers: ["framework-cppstream-protos"],

	// our public headers depend on libsensor and libsensorprivacy		export_shared_lib_headers: [
	export_shared_lib_headers: ["libsensor", "libsensorprivacy"],		"libactivitymanager_aidl",
			"libsensor",
			"libsensorprivacy",
			],
	}		}

	cc_binary {		cc_binary {