Merge "Export AIDL files as a filegroup for framework.jar" (ec92cd91) · Commits · e / os / android_frameworks_av

camera/Android.bp

+23 −6

Original line number	Diff line number	Diff line
		@@ -29,12 +29,7 @@ cc_library_shared {
		// AIDL files for camera interfaces
		// The headers for these interfaces will be available to any modules that
		// include libcamera_client, at the path "aidl/package/path/BnFoo.h"
		"aidl/android/hardware/ICameraService.aidl",
		"aidl/android/hardware/ICameraServiceListener.aidl",
		"aidl/android/hardware/ICameraServiceProxy.aidl",
		"aidl/android/hardware/camera2/ICameraDeviceCallbacks.aidl",
		"aidl/android/hardware/camera2/ICameraDeviceUser.aidl",

		":libcamera_client_aidl",

		// Source for camera interface parcelables, and manually-written interfaces
		"Camera.cpp",
		@@ -81,3 +76,25 @@ cc_library_shared {
		],

		}

		// AIDL interface between libcamera_client and framework.jar.
		filegroup {
		name: "libcamera_client_aidl",
		srcs: [
		"aidl/android/hardware/ICameraService.aidl",
		"aidl/android/hardware/ICameraServiceListener.aidl",
		"aidl/android/hardware/ICameraServiceProxy.aidl",
		"aidl/android/hardware/camera2/ICameraDeviceCallbacks.aidl",
		"aidl/android/hardware/camera2/ICameraDeviceUser.aidl",
		],
		}

		// Extra AIDL files that are used by framework.jar but not libcamera_client
		// because they have hand-written native implementations.
		filegroup {
		name: "libcamera_client_framework_aidl",
		srcs: [
		"aidl/android/hardware/ICamera.aidl",
		"aidl/android/hardware/ICameraClient.aidl",
		],
		}

+12 −4

Original line number	Diff line number	Diff line
		@@ -11,10 +11,7 @@ cc_library_shared {
		},

		srcs: [
		"aidl/android/media/ICas.aidl",
		"aidl/android/media/ICasListener.aidl",
		"aidl/android/media/IDescrambler.aidl",
		"aidl/android/media/IMediaCasService.aidl",
		":libmediadrm_aidl",

		"CasImpl.cpp",
		"DescramblerImpl.cpp",
		@@ -49,3 +46,14 @@ cc_library_shared {
		"-Wall",
		],
		}

		// AIDL interface between libmediadrm and framework.jar
		filegroup {
		name: "libmediadrm_aidl",
		srcs: [
		"aidl/android/media/ICas.aidl",
		"aidl/android/media/ICasListener.aidl",
		"aidl/android/media/IDescrambler.aidl",
		"aidl/android/media/IMediaCasService.aidl",
		],
		}