diff options
| author | Dan Pasanen <dan.pasanen@gmail.com> | 2014-04-17 21:53:19 -0500 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-30 04:18:31 -0700 |
| commit | 1fd8e631d92c56fa6872c3365c83bbf8fbca592e (patch) | |
| tree | e48446339d8e4d3e75503b35576538bccb69b0b8 | |
| parent | 9c96b1d340c586133eecfad0fc15e62d6669c324 (diff) | |
| download | frameworks_av-1fd8e631d92c56fa6872c3365c83bbf8fbca592e.zip frameworks_av-1fd8e631d92c56fa6872c3365c83bbf8fbca592e.tar.gz frameworks_av-1fd8e631d92c56fa6872c3365c83bbf8fbca592e.tar.bz2 | |
camera: add ability for a device to specify MAX_CAMERAS
Change-Id: I3db99ea4eff63aab3448efe7b2eb51366c658c03
| -rw-r--r-- | media/mediaserver/Android.mk | 4 | ||||
| -rw-r--r-- | services/camera/libcameraservice/Android.mk | 4 | ||||
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk index b6de0d9..8aeabf0 100644 --- a/media/mediaserver/Android.mk +++ b/media/mediaserver/Android.mk @@ -50,6 +50,10 @@ LOCAL_C_INCLUDES := \ frameworks/av/services/radio \ external/sonic +ifneq ($(BOARD_NUMBER_OF_CAMERAS),) + LOCAL_CFLAGS += -DMAX_CAMERAS=$(BOARD_NUMBER_OF_CAMERAS) +endif + LOCAL_MODULE:= mediaserver LOCAL_32_BIT_ONLY := true diff --git a/services/camera/libcameraservice/Android.mk b/services/camera/libcameraservice/Android.mk index 45b8f9f..f3087d8 100644 --- a/services/camera/libcameraservice/Android.mk +++ b/services/camera/libcameraservice/Android.mk @@ -83,6 +83,10 @@ ifeq ($(BOARD_NEEDS_MEMORYHEAPION),true) LOCAL_CFLAGS += -DUSE_MEMORY_HEAP_ION endif +ifneq ($(BOARD_NUMBER_OF_CAMERAS),) + LOCAL_CFLAGS += -DMAX_CAMERAS=$(BOARD_NUMBER_OF_CAMERAS) +endif + LOCAL_MODULE:= libcameraservice include $(BUILD_SHARED_LIBRARY) diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index f6fc0b1..b88434d 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -48,6 +48,10 @@ #include <memory> #include <utility> +#ifndef MAX_CAMERAS +#define MAX_CAMERAS 2 +#endif + namespace android { extern volatile int32_t gLogLevel; |