diff options
| author | Shukla Mradul <mradul_shukla@codeaurora.org> | 2016-05-21 14:32:30 +0530 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2018-01-19 14:09:15 +0100 |
| commit | 68478ce3e332bcb008c55f793adb11b88f63ad03 (patch) | |
| tree | d907aa85ee4ec9133ab0e9fa8732a8f1ef05d273 /camera/QCamera2/Android.mk | |
| parent | c738fd68836e01567b19868f7e3a586f15c6dc98 (diff) | |
msm8996-common: QCamera2:HAL : HAL1 Removal during Compile time
Issue:
Compile time HAL1 Removal as for IOT projects we are going to use only HAL3 so
removing HAL1 Camera files from compile time.
fix:
Modified the Android.mk file to remove HAL1 during compilation.In
case if HAL1 is not getting compiled muxer object is also not created
in QCamera2Factory.
CRs-Fixed: 1021955
Change-Id: I17af448d7c423c73c5f3c29e95fb42cc69ca5944
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Diffstat (limited to 'camera/QCamera2/Android.mk')
| -rw-r--r-- | camera/QCamera2/Android.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index 369b5bd..44eca2f 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -7,7 +7,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ util/QCameraBufferMaps.cpp \ util/QCameraCmdThread.cpp \ - util/QCameraDisplay.cpp \ util/QCameraFlash.cpp \ util/QCameraPerf.cpp \ util/QCameraQueue.cpp \ @@ -26,12 +25,20 @@ LOCAL_SRC_FILES += \ HAL3/QCamera3CropRegionMapper.cpp \ HAL3/QCamera3StreamMem.cpp +LOCAL_CFLAGS := -Wall -Wextra -Werror + #HAL 1.0 source + +ifeq ($(TARGET_SUPPORT_HAL1),false) +LOCAL_CFLAGS += -DQCAMERA_HAL3_SUPPORT +else +LOCAL_CFLAGS += -DQCAMERA_HAL1_SUPPORT LOCAL_SRC_FILES += \ HAL/QCamera2HWI.cpp \ HAL/QCameraMuxer.cpp \ HAL/QCameraMem.cpp \ HAL/QCameraStateMachine.cpp \ + util/QCameraDisplay.cpp \ HAL/QCameraChannel.cpp \ HAL/QCameraStream.cpp \ HAL/QCameraPostProc.cpp \ @@ -39,8 +46,7 @@ LOCAL_SRC_FILES += \ HAL/QCameraParameters.cpp \ HAL/QCameraParametersIntf.cpp \ HAL/QCameraThermalAdapter.cpp - -LOCAL_CFLAGS := -Wall -Wextra -Werror +endif # System header file path prefix LOCAL_CFLAGS += -DSYSTEM_HEADER_PREFIX=sys @@ -56,6 +62,7 @@ ifeq ($(TARGET_USES_MEDIA_EXTENSIONS), true) LOCAL_CFLAGS += -DUSE_MEDIA_EXTENSIONS endif +LOCAL_CFLAGS += -std=c++11 -std=gnu++0x #HAL 1.0 Flags LOCAL_CFLAGS += -DDEFAULT_DENOISE_MODE_ON -DHAL3 -DQCAMERA_REDEFINE_LOG |