diff options
| author | Santhosh Kumar Thimmanna Bhattar <sthim@codeaurora.org> | 2018-04-04 15:37:33 +0530 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2020-01-25 14:48:43 +0100 |
| commit | 48c62c50622c3e3c745eda535b0838f538a02413 (patch) | |
| tree | 6f236ec626cb9b3fa4e9451a35b880a16ae480bf /camera/QCamera2/Android.mk | |
| parent | 66af765b3d375fc6f79329dad531c6e53beabd1e (diff) | |
msm8996-common: camera: Changes to fix QCameraDisplay compilation issues
Changes to fix QCameraDisplay compilation issue.
Change-Id: Iaa28e2b0acff0556d6052945e446066aa27be5b1
Diffstat (limited to 'camera/QCamera2/Android.mk')
| -rw-r--r-- | camera/QCamera2/Android.mk | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index 0243053..39a9ef6 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -10,6 +10,7 @@ LOCAL_SRC_FILES := \ util/QCameraFlash.cpp \ util/QCameraPerf.cpp \ util/QCameraQueue.cpp \ + util/QCameraDisplay.cpp \ util/QCameraCommon.cpp \ QCamera2Hal.cpp \ QCamera2Factory.cpp @@ -58,7 +59,16 @@ ifeq ($(TARGET_USES_MEDIA_EXTENSIONS), true) LOCAL_CFLAGS += -DUSE_MEDIA_EXTENSIONS endif +#USE_DISPLAY_SERVICE from Android O onwards +#to receive vsync event from display +ifeq ($(filter OMR1 O 8.1.0, $(PLATFORM_VERSION)), ) +USE_DISPLAY_SERVICE := true +LOCAL_CFLAGS += -DUSE_DISPLAY_SERVICE +LOCAL_CFLAGS += -std=c++11 -std=gnu++1y +else LOCAL_CFLAGS += -std=c++11 -std=gnu++0x +endif + #HAL 1.0 Flags LOCAL_CFLAGS += -DDEFAULT_DENOISE_MODE_ON -DHAL3 -DQCAMERA_REDEFINE_LOG @@ -102,6 +112,11 @@ LOCAL_C_INCLUDES += \ 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 ($(USE_DISPLAY_SERVICE),true) +LOCAL_SHARED_LIBRARIES += android.frameworks.displayservice@1.0 android.hidl.base@1.0 libhidlbase +else +LOCAL_SHARED_LIBRARIES += libgui +endif ifeq ($(TARGET_TS_MAKEUP),true) LOCAL_SHARED_LIBRARIES += libts_face_beautify_hal libts_detected_face_hal endif |