Merge "Run bpfmt on camera/Android.bp and camera/ndk/Android.bp." into main (41b05e82) · Commits · e / os / android_frameworks_av

camera/Android.bp

+13 −13

Original line number	Diff line number	Diff line
		@@ -86,40 +86,40 @@ cc_library {

		// Source for camera interface parcelables, and manually-written interfaces
		"Camera.cpp",
		"CameraBase.cpp",
		"CameraMetadata.cpp",
		"CameraParameters.cpp",
		"CaptureResult.cpp",
		"CameraParameters2.cpp",
		"CameraSessionStats.cpp",
		"CameraUtils.cpp",
		"CaptureResult.cpp",
		"ICamera.cpp",
		"ICameraClient.cpp",
		"ICameraRecordingProxy.cpp",
		"VendorTagDescriptor.cpp",
		"camera2/CaptureRequest.cpp",
		"camera2/ConcurrentCamera.cpp",
		"camera2/OutputConfiguration.cpp",
		"camera2/SessionConfiguration.cpp",
		"camera2/SubmitInfo.cpp",
		"CameraBase.cpp",
		"CameraUtils.cpp",
		"VendorTagDescriptor.cpp",
		],

		shared_libs: [
		"camera_platform_flags_c_lib",
		"lib-platform-compat-native-api",
		"libbase",
		"libcutils",
		"libutils",
		"liblog",
		"libbinder",
		"libgui",
		"libcamera_metadata",
		"libcutils",
		"libgui",
		"liblog",
		"libnativewindow",
		"lib-platform-compat-native-api",
		"libutils",
		],

		include_dirs: [
		"system/media/private/camera/include",
		"frameworks/native/include/media/openmax",
		"system/media/private/camera/include",
		],
		export_include_dirs: [
		"include",
		@@ -127,13 +127,13 @@ cc_library {
		],
		export_shared_lib_headers: [
		"libcamera_metadata",
		"libnativewindow",
		"libgui",
		"libnativewindow",
		],

		cflags: [
		"-Werror",
		"-Wall",
		"-Werror",
		"-Wextra",
		],

		@@ -153,8 +153,8 @@ cc_library_host_static {
		],

		include_dirs: [
		"system/media/private/camera/include",
		"frameworks/native/include/media/openmax",
		"system/media/private/camera/include",
		],

		export_include_dirs: [

camera/ndk/Android.bp

+34 −34

Original line number	Diff line number	Diff line
		@@ -66,40 +66,40 @@ ndk_headers {
		cc_library_shared {
		name: "libcamera2ndk",
		srcs: [
		"NdkCameraCaptureSession.cpp",
		"NdkCameraDevice.cpp",
		"NdkCameraManager.cpp",
		"NdkCameraMetadata.cpp",
		"NdkCameraDevice.cpp",
		"NdkCaptureRequest.cpp",
		"NdkCameraCaptureSession.cpp",
		"impl/ACameraCaptureSession.cpp",
		"impl/ACameraDevice.cpp",
		"impl/ACameraManager.cpp",
		"impl/ACameraMetadata.cpp",
		"impl/ACameraDevice.cpp",
		"impl/ACameraCaptureSession.cpp",
		],
		shared_libs: [
		"android.companion.virtual.virtualdevice_aidl-cpp",
		"android.companion.virtualdevice.flags-aconfig-cc",
		"libbinder",
		"liblog",
		"libgui",
		"libutils",
		"libandroid_runtime",
		"libbinder",
		"libcamera_client",
		"libstagefright_foundation",
		"libcutils",
		"libcamera_metadata",
		"libcutils",
		"libgui",
		"liblog",
		"libmediandk",
		"libnativewindow",
		"libstagefright_foundation",
		"libutils",
		],
		header_libs: [
		"jni_headers",
		],
		cflags: [
		"-fvisibility=hidden",
		"-DEXPORT=__attribute__((visibility(\"default\")))",
		"-Wall",
		"-Wextra",
		"-Werror",
		"-Wextra",
		"-fvisibility=hidden",
		],
		// TODO: jchowdhary@, use header_libs instead b/131165718
		include_dirs: [
		@@ -117,16 +117,16 @@ cc_library_shared {
		cpp_std: "gnu++17",
		vendor: true,
		srcs: [
		"ndk_vendor/impl/ACameraDevice.cpp",
		"ndk_vendor/impl/ACameraManager.cpp",
		"ndk_vendor/impl/utils.cpp",
		"impl/ACameraMetadata.cpp",
		"impl/ACameraCaptureSession.cpp",
		"NdkCameraMetadata.cpp",
		"NdkCameraCaptureSession.cpp",
		"NdkCameraManager.cpp",
		"NdkCameraDevice.cpp",
		"NdkCameraManager.cpp",
		"NdkCameraMetadata.cpp",
		"NdkCaptureRequest.cpp",
		"impl/ACameraCaptureSession.cpp",
		"impl/ACameraMetadata.cpp",
		"ndk_vendor/impl/ACameraDevice.cpp",
		"ndk_vendor/impl/ACameraManager.cpp",
		"ndk_vendor/impl/utils.cpp",
		],

		export_include_dirs: ["include"],
		@@ -135,30 +135,30 @@ cc_library_shared {
		],
		local_include_dirs: [
		".",
		"include",
		"impl",
		"include",
		],
		cflags: [
		"-fvisibility=hidden",
		"-DEXPORT=__attribute__((visibility(\"default\")))",
		"-D__ANDROID_VNDK__",
		"-fvisibility=hidden",
		],

		shared_libs: [
		"android.frameworks.cameraservice.common-V1-ndk",
		"android.frameworks.cameraservice.device-V2-ndk",
		"android.frameworks.cameraservice.service-V2-ndk",
		"libbinder_ndk",
		"libcamera_metadata",
		"libcutils",
		"libfmq",
		"libhidlbase",
		"libhardware",
		"libnativewindow",
		"libhidlbase",
		"liblog",
		"libutils",
		"libstagefright_foundation",
		"libcutils",
		"libcamera_metadata",
		"libmediandk",
		"android.frameworks.cameraservice.common-V1-ndk",
		"android.frameworks.cameraservice.device-V2-ndk",
		"android.frameworks.cameraservice.service-V2-ndk",
		"libnativewindow",
		"libstagefright_foundation",
		"libutils",
		],
		static_libs: [
		"android.hardware.camera.common@1.0-helper",
		@@ -175,19 +175,19 @@ cc_test {
		name: "ACameraNdkVendorTest",
		vendor: true,
		srcs: [
		"ndk_vendor/tests/AImageReaderVendorTest.cpp",
		"ndk_vendor/tests/ACameraManagerTest.cpp",
		"ndk_vendor/tests/AImageReaderVendorTest.cpp",
		],
		shared_libs: [
		"libcamera2ndk_vendor",
		"libcamera_metadata",
		"libcutils",
		"libhidlbase",
		"liblog",
		"libmediandk",
		"libnativewindow",
		"libutils",
		"libui",
		"libcutils",
		"liblog",
		"libutils",
		],
		static_libs: [
		"android.hardware.camera.common@1.0-helper",