Merge "Match src paths with aidl package name" (1224227e) · Commits · e / os / android_frameworks_av

camera/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,7 @@ filegroup {
		"aidl/android/hardware/camera2/ICameraDeviceCallbacks.aidl",
		"aidl/android/hardware/camera2/ICameraDeviceUser.aidl",
		],
		path: "aidl",
		}

		// Extra AIDL files that are used by framework.jar but not libcamera_client
		@@ -97,4 +98,5 @@ filegroup {
		"aidl/android/hardware/ICamera.aidl",
		"aidl/android/hardware/ICameraClient.aidl",
		],
		path: "aidl",
		}

+12 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ cc_library_shared {
		// AIDL files for audioclient interfaces
		// The headers for these interfaces will be available to any modules that
		// include libaudioclient, at the path "aidl/package/path/BnFoo.h"
		"aidl/android/media/IAudioRecord.aidl",
		":libaudioclient_aidl_private",
		":libaudioclient_aidl",

		"AudioEffect.cpp",
		@@ -83,4 +83,15 @@ filegroup {
		srcs: [
		"aidl/android/media/IPlayer.aidl",
		],
		path: "aidl",
		}

		// Used to strip the "aidl/" from the path, so the build system can predict the
		// output filename.
		filegroup {
		name: "libaudioclient_aidl_private",
		srcs: [
		"aidl/android/media/IAudioRecord.aidl",
		],
		path: "aidl",
		}

+11 −2

Original line number	Diff line number	Diff line
		@@ -44,6 +44,15 @@ cc_library {
		clang: true,
		}

		filegroup {
		name: "libmedia_omx_aidl",
		srcs: [
		"aidl/android/IGraphicBufferSource.aidl",
		"aidl/android/IOMXBufferSource.aidl",
		],
		path: "aidl",
		}

		cc_library_shared {
		name: "libmedia_omx",
		vendor_available: true,
		@@ -53,8 +62,7 @@ cc_library_shared {
		double_loadable: true,

		srcs: [
		"aidl/android/IGraphicBufferSource.aidl",
		"aidl/android/IOMXBufferSource.aidl",
		":libmedia_omx_aidl",

		"IMediaCodecList.cpp",
		"IOMX.cpp",
		@@ -150,6 +158,7 @@ filegroup {
		srcs: [
		"aidl/android/media/IMediaExtractorUpdateService.aidl",
		],
		path: "aidl",
		}

		cc_library {