Merge "Replace filegroup with aidl_library module type" (3c0960d6) · Commits · e / os / android_frameworks_base

core/java/Android.bp

+9 −4

Original line number	Original line	Diff line number	Diff line
	@@ -31,9 +31,14 @@ filegroup {
	srcs: ["android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl"],		srcs: ["android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl"],
	}		}

	filegroup {		aidl_library {
	name: "IDropBoxManagerService.aidl",		name: "IDropBoxManagerService_aidl",
	srcs: ["com/android/internal/os/IDropBoxManagerService.aidl"],		srcs: [
			"com/android/internal/os/IDropBoxManagerService.aidl",
			],
			hdrs: [
			"android/os/DropBoxManager.aidl",
			],
	}		}

	filegroup {		filegroup {
	@@ -146,7 +151,7 @@ filegroup {
	],		],
	}		}

	filegroup {		aidl_library {
	name: "ILogcatManagerService_aidl",		name: "ILogcatManagerService_aidl",
	srcs: ["android/os/logcat/ILogcatManagerService.aidl"],		srcs: ["android/os/logcat/ILogcatManagerService.aidl"],
	}		}

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -26,8 +26,6 @@ package {
	cc_library_shared {		cc_library_shared {
	name: "libservices",		name: "libservices",
	srcs: [		srcs: [
	":IDropBoxManagerService.aidl",
	":ILogcatManagerService_aidl",
	"src/content/ComponentName.cpp",		"src/content/ComponentName.cpp",
	"src/os/DropBoxManager.cpp",		"src/os/DropBoxManager.cpp",
	],		],
	@@ -42,7 +40,10 @@ cc_library_shared {
	"libbase_headers",		"libbase_headers",
	],		],
	aidl: {		aidl: {
	include_dirs: ["frameworks/base/core/java/"],		libs: [
			"ILogcatManagerService_aidl",
			"IDropBoxManagerService_aidl",
			],
	},		},

	export_include_dirs: ["include"],		export_include_dirs: ["include"],