bullhead: point media HAL at msm8974/ specific directory
Bug: 27420204
Change-Id: Ia28c4f6ed6af4cefcafa03728ea54987c83699d7
diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk
index 1701ace..804abcf 100644
--- a/camera/QCamera2/Android.mk
+++ b/camera/QCamera2/Android.mk
@@ -53,7 +53,7 @@
$(LOCAL_PATH)/stack/common \
frameworks/native/include/media/hardware \
frameworks/native/include/media/openmax \
- hardware/qcom/media/libstagefrighthw \
+ hardware/qcom/msm8974/media/libstagefrighthw \
system/media/camera/include \
$(LOCAL_PATH)/../mm-image-codec/qexif \
$(LOCAL_PATH)/../mm-image-codec/qomx_core \
diff --git a/camera/QCamera2/stack/mm-camera-interface/Android.mk b/camera/QCamera2/stack/mm-camera-interface/Android.mk
index 1fc768d..ff71773 100644
--- a/camera/QCamera2/stack/mm-camera-interface/Android.mk
+++ b/camera/QCamera2/stack/mm-camera-interface/Android.mk
@@ -37,7 +37,7 @@
LOCAL_C_INCLUDES+= $(kernel_includes)
LOCAL_ADDITIONAL_DEPENDENCIES := $(common_deps)
-LOCAL_C_INCLUDES += hardware/qcom/media/mm-core/inc
+LOCAL_C_INCLUDES += hardware/qcom/media/msm8974/mm-core/inc
ifneq (1,$(filter 1,$(shell echo "$$(( $(PLATFORM_SDK_VERSION) >= 17 ))" )))
LOCAL_CFLAGS += -include bionic/libc/kernel/common/linux/socket.h
