diff options
| author | Sauhard Pande <sauhardp@codeaurora.org> | 2017-05-30 17:49:53 +0530 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2018-01-19 14:11:03 +0100 |
| commit | 29f66f1dc5ba20695bebddde37c7a499822af973 (patch) | |
| tree | e6980c3097374ca9cf4f1b918d16e78fb3df4774 /camera/QCamera2/Android.mk | |
| parent | 31906b4768868460b57a12a97ccf3537003073db (diff) | |
QCamera2: For supporting VNDK and Treble rules.
Issue: In accordance to treble rules libcamera_client.so cannot be
used or included. For HAL1 needed support for values of
Cameraparameters for HAL1 QCameraParameters
Solution: Included Cameraparameters.h and .cpp files to this location
as well.
Change-Id: If04d8a342d1552d2f0ba665b08b312e98bf8b9f5
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Diffstat (limited to 'camera/QCamera2/Android.mk')
| -rw-r--r-- | camera/QCamera2/Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index 7217d4c..371f7f3 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -38,12 +38,12 @@ LOCAL_SRC_FILES += \ HAL/QCameraMuxer.cpp \ HAL/QCameraMem.cpp \ HAL/QCameraStateMachine.cpp \ - util/QCameraDisplay.cpp \ HAL/QCameraChannel.cpp \ HAL/QCameraStream.cpp \ HAL/QCameraPostProc.cpp \ HAL/QCamera2HWICallbacks.cpp \ HAL/QCameraParameters.cpp \ + HAL/CameraParameters.cpp \ HAL/QCameraParametersIntf.cpp \ HAL/QCameraThermalAdapter.cpp endif @@ -106,13 +106,16 @@ LOCAL_C_INCLUDES += \ $(TARGET_OUT_HEADERS)/qcom/display LOCAL_C_INCLUDES += \ $(call project-path-for,qcom-display)/libqservice -LOCAL_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils libdl libsync libgui +LOCAL_SHARED_LIBRARIES := liblog libhardware libutils libcutils libdl libsync LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface libui libcamera_metadata LOCAL_SHARED_LIBRARIES += libqdMetaData libqservice libbinder ifeq ($(TARGET_TS_MAKEUP),true) LOCAL_SHARED_LIBRARIES += libts_face_beautify_hal libts_detected_face_hal endif +LOCAL_STATIC_LIBRARIES := android.hardware.camera.common@1.0-helper + + LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_MODULE := camera.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_TAGS := optional |