diff options
| author | dev-harsh1998 <harshit.india@linaro.org> | 2017-08-26 22:20:57 +0530 |
|---|---|---|
| committer | dev-harsh1998 <harshitjain6751@gmail.com> | 2017-10-18 12:37:51 +0530 |
| commit | 0d3d8c22fbf3b822b74d92264c182edb6fd3a52f (patch) | |
| tree | 2e14c5f9e9857f1335df7ef63dececd7f4632049 | |
| parent | 563694d811ec48bf6e10142c6b18722aecc499c2 (diff) | |
a6000: camera: Lets actually make the HAL compile
* remove is-vendor-board-platform QCOM condition
Change-Id: Idb738791739103bd82e2c14c7487d618d4693fac
| -rw-r--r-- | camera/Android.mk | 16 | ||||
| -rwxr-xr-x | camera/QCamera2/stack/mm-camera-interface/Android.mk | 2 | ||||
| -rw-r--r-- | camera/QCamera2/stack/mm-camera-test/Android.mk | 4 |
3 files changed, 1 insertions, 21 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index 48d6b25..5053e7d 100644 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -1,15 +1 @@ -ifeq ($(call my-dir),$(call project-path-for,qcom-camera)) -MM_V4L2_DRIVER_LIST += msm8960 -MM_V4L2_DRIVER_LIST += msm8974 -MM_V4L2_DRIVER_LIST += msm8226 -MM_V4L2_DRIVER_LIST += msm8610 -MM_V4L2_DRIVER_LIST += msm_bronze -MM_V4L2_DRIVER_LIST += msm8916 -MM_V4L2_DRIVER_LIST += msm8909 -LOCAL_32_BIT_ONLY := true -ifeq ($(call is-board-platform-in-list,$(MM_V4L2_DRIVER_LIST)),true) - ifneq ($(BUILD_TINY_ANDROID),true) - include $(call all-subdir-makefiles) - endif -endif -endif +include $(call all-subdir-makefiles) diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk index 0492c57..fb60fd1 100755 --- a/camera/QCamera2/stack/mm-camera-interface/Android.mk +++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk @@ -1,4 +1,3 @@ -ifeq ($(call is-vendor-board-platform,QCOM),true) OLD_LOCAL_PATH := $(LOCAL_PATH) LOCAL_PATH := $(call my-dir) @@ -62,4 +61,3 @@ LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) LOCAL_PATH := $(OLD_LOCAL_PATH) -endif diff --git a/camera/QCamera2/stack/mm-camera-test/Android.mk b/camera/QCamera2/stack/mm-camera-test/Android.mk index 2734064..d82b55d 100644 --- a/camera/QCamera2/stack/mm-camera-test/Android.mk +++ b/camera/QCamera2/stack/mm-camera-test/Android.mk @@ -1,4 +1,3 @@ -ifeq ($(call is-vendor-board-platform,QCOM),true) OLD_LOCAL_PATH := $(LOCAL_PATH) LOCAL_PATH:=$(call my-dir) @@ -105,9 +104,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= mm-qcamera-app LOCAL_32_BIT_ONLY := true include $(BUILD_EXECUTABLE) -endif -ifeq ($(call is-vendor-board-platform,QCOM),true) # Build tuning library include $(CLEAR_VARS) @@ -211,4 +208,3 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= libmm-qcamera LOCAL_32_BIT_ONLY := true include $(BUILD_SHARED_LIBRARY) -endif |