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

Commit e172c113 authored by Ethan Chen's avatar Ethan Chen Committed by Steve Kondik
Browse files

camera: Allow devices to load custom CameraParameter code 

* Some devices need additional code to load their cameras. Add a hook
  for extra classes and symbols to be included.

Change-Id: Ifbe79e25b7ab47c5d468f5179032a4283b3f0df5
(cherry picked from commit 38681625)
parent 4da982f5

camera/Android.mk

+15 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ LOCAL_SRC_FILES := \ 
LOCAL_SRC_FILES += \

	Camera.cpp \

	CameraMetadata.cpp \

	CameraParameters.cpp \

	CaptureResult.cpp \

	CameraParameters2.cpp \

	ICamera.cpp \
@@ -75,6 +74,21 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \ 


LOCAL_CFLAGS += -Werror -Wall -Wextra



ifneq ($(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY),)

LOCAL_WHOLE_STATIC_LIBRARIES += $(TARGET_SPECIFIC_CAMERA_PARAMETER_LIBRARY)

else

LOCAL_WHOLE_STATIC_LIBRARIES += libcamera_parameters

endif



LOCAL_MODULE:= libcamera_client



include $(BUILD_SHARED_LIBRARY)



include $(CLEAR_VARS)



LOCAL_SRC_FILES := \

	CameraParameters.cpp



LOCAL_MODULE := libcamera_parameters



include $(BUILD_STATIC_LIBRARY)