commit 7ccdef28e05e7f2e947ebd93185c5a62e9e7707a
author Vineeta Srivastava <vsrivastava@google.com> Wed Jun 12 08:47:42 2013 -0700
committer Vineeta Srivastava <vsrivastava@google.com> Wed Jun 12 08:47:42 2013 -0700
tree 7d0da1ad4bc5106e90b106499338db976ecf2f1a
parent 8c76a076cf468d80fb91034e10a1f5bc7200996b

Splitting hardware/qcom/display chip specific.

Qualcomm msm8960 and msm8974 specific code is split in msm8960 and msm8974
directories. Makefile points to TARGET_BOARD_PLATFORM specific directories.

Change-Id: I7df92d149363fa9a2d05103ded2801531041e363

camera/QCamera2/HAL/Android.mk

diff --git a/camera/QCamera2/HAL/Android.mk b/camera/QCamera2/HAL/Android.mk
index c7f121d..cb386ac 100644
--- a/camera/QCamera2/HAL/Android.mk
+++ b/camera/QCamera2/HAL/Android.mk
@@ -24,12 +24,19 @@
 LOCAL_C_INCLUDES := \
         $(LOCAL_PATH)/../stack/common \
         frameworks/native/include/media/openmax \
-        hardware/qcom/display/libgralloc \
         hardware/qcom/media/libstagefrighthw \
         $(LOCAL_PATH)/../../mm-image-codec/qexif \
         $(LOCAL_PATH)/../../mm-image-codec/qomx_core \
         $(LOCAL_PATH)/../util
 
+ifneq ($(filter msm8974 msm8x74,$(TARGET_BOARD_PLATFORM)),)
+LOCAL_C_INCLUDES += \
+        hardware/qcom/display/msm8974/libgralloc
+else
+LOCAL_C_INCLUDES += \
+        hardware/qcom/display/msm8960/libgralloc
+endif
+
 LOCAL_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils libdl
 LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface
 

camera/QCamera2/HAL3/Android.mk

diff --git a/camera/QCamera2/HAL3/Android.mk b/camera/QCamera2/HAL3/Android.mk
index 6a7e0a8..c65924a 100644
--- a/camera/QCamera2/HAL3/Android.mk
+++ b/camera/QCamera2/HAL3/Android.mk
@@ -22,13 +22,20 @@
         frameworks/native/include/media/openmax \
         frameworks/native/include \
         frameworks/av/include \
-        hardware/qcom/display/libgralloc \
         hardware/qcom/media/libstagefrighthw \
         system/media/camera/include \
         $(LOCAL_PATH)/../../mm-image-codec/qexif \
         $(LOCAL_PATH)/../../mm-image-codec/qomx_core \
         $(LOCAL_PATH)/../util
 
+ifneq ($(filter msm8974 msm8x74,$(TARGET_BOARD_PLATFORM)),)
+LOCAL_C_INCLUDES += \
+        hardware/qcom/display/msm8974/libgralloc
+else
+LOCAL_C_INCLUDES += \
+        hardware/qcom/display/msm8960/libgralloc
+endif
+
 LOCAL_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils libdl
 LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface libui libcamera_metadata