Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a71d83c8 authored by Dan Pasanen's avatar Dan Pasanen Committed by Ricardo Cerqueira
Browse files

camera: add ability for a device to specify MAX_CAMERAS 

RM-1

Change-Id: I3db99ea4eff63aab3448efe7b2eb51366c658c03
parent 373efa07

media/mediaserver/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_LISTEN)),true) 
  LOCAL_CFLAGS += -DAUDIO_LISTEN_ENABLED

endif



ifneq ($(BOARD_NUMBER_OF_CAMERAS),)

    LOCAL_CFLAGS += -DMAX_CAMERAS=$(BOARD_NUMBER_OF_CAMERAS)

endif



LOCAL_MODULE:= mediaserver

LOCAL_32_BIT_ONLY := true

services/camera/libcameraservice/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -79,6 +79,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)

services/camera/libcameraservice/CameraService.h

+2 −1
Original line number Diff line number Diff line
@@ -37,8 +37,9 @@ 


#include <camera/ICameraServiceListener.h>



/* This needs to be increased if we can have more cameras */

#ifndef MAX_CAMERAS

#define MAX_CAMERAS 2

#endif



namespace android {