Merge "Merge "Replace filegroup with aidl_library module type" am: 3c0960d65a... (06679f55) · Commits · e / os / android_frameworks_base

core/java/Android.bp

+9 −4

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

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

		filegroup {
		@@ -138,7 +143,7 @@ filegroup {
		],
		}

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

+4 −3

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

		export_include_dirs: ["include"],