Merge "Camera: binderize camera hal" (1e9c4e02) · Commits · e / os / android_hardware_interfaces

camera/device/3.2/default/Android.bp

+24 −0

Original line number	Diff line number	Diff line
		@@ -20,3 +20,27 @@ cc_library_shared {
		],
		export_include_dirs: ["."]
		}

		cc_library_shared {
		name: "android.hardware.camera.device@3.2-impl-binderized",
		srcs: ["CameraDevice.cpp",
		"CameraDeviceSession.cpp",
		"convert.cpp"],
		cppflags: ["-DBINDERIZED"],
		shared_libs: [
		"libhidlbase",
		"libhidltransport",
		"libhwbinder",
		"libutils",
		"libcutils",
		"android.hardware.camera.device@3.2",
		"android.hardware.camera.provider@2.4",
		"liblog",
		"libhardware",
		"libcamera_metadata"
		],
		static_libs: [
		"android.hardware.camera.common@1.0-helper"
		],
		export_include_dirs: ["."]
		}

+26 −0

Original line number	Diff line number	Diff line
		@@ -21,3 +21,29 @@ cc_library_shared {
		"android.hardware.camera.common@1.0-helper"
		]
		}

		cc_binary {
		name: "android.hardware.camera.provider@2.4-service",
		relative_install_path: "hw",
		srcs: ["service.cpp", "CameraProvider.cpp"],
		compile_multilib: "32",
		init_rc: ["android.hardware.camera.provider@2.4-service.rc"],
		shared_libs: [
		"libhidlbase",
		"libhidltransport",
		"liblog",
		"libhwbinder",
		"libutils",
		"libhardware",
		"android.hardware.camera.device@1.0",
		"android.hardware.camera.device@3.2",
		"android.hardware.camera.provider@2.4",
		"android.hardware.camera.common@1.0",
		"libcutils",
		"android.hardware.camera.device@3.2-impl-binderized",
		"libcamera_metadata"
		],
		static_libs: [
		"android.hardware.camera.common@1.0-helper"
		]
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,6 @@
		#define LOG_TAG "CamProvider@2.4-impl"
		#include <android/log.h>

		#include <regex>

		#include "CameraProvider.h"
		#include "CameraDevice.h"
		#include <string.h>

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		#ifndef ANDROID_HARDWARE_CAMERA_PROVIDER_V2_4_CAMERAPROVIDER_H
		#define ANDROID_HARDWARE_CAMERA_PROVIDER_V2_4_CAMERAPROVIDER_H

		#include <regex>
		#include "hardware/camera_common.h"
		#include "utils/Mutex.h"
		#include "utils/SortedVector.h"

0 → 100644

+6 −0

Original line number	Diff line number	Diff line
		service camera-provider-2-4 /system/bin/hw/android.hardware.camera.provider@2.4-service
		class hal
		user cameraserver
		group audio camera input drmrpc
		ioprio rt 4
		writepid /dev/cpuset/camera-daemon/tasks /dev/stune/top-app/tasks
		No newline at end of file