flo: enable device-specific camera
b/10429994
Change-Id: Ia03f3a7628448afb8b115a898a3373f95e1dcbd0
Signed-off-by: Iliyan Malchev <malchev@google.com>
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 2233c6d..2de1e86 100755
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -99,4 +99,6 @@
USE_DEVICE_SPECIFIC_QCOM_PROPRIETARY := true
OVERRIDE_RS_DRIVER := libRSDriver_adreno.so
+USE_DEVICE_SPECIFIC_CAMERA:= true
+
HAVE_ADRENO_SOURCE:= false
diff --git a/camera/Android.mk b/camera/Android.mk
index 2724593..8faf8d7 100644
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -1,4 +1,4 @@
-ifneq ($(strip $(USE_DEVICE_SPECIFIC_CAMERA)),true)
+ifeq ($(strip $(USE_DEVICE_SPECIFIC_CAMERA)),true)
ifneq ($(filter msm8960 msm8226 msm8974,$(TARGET_BOARD_PLATFORM)),)
ifneq ($(USE_CAMERA_STUB),true)
ifneq ($(BUILD_TINY_ANDROID),true)
diff --git a/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
index e8aad0e..5c7dffe 100644
--- a/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
+++ b/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk
@@ -15,7 +15,7 @@
endif
OMX_HEADER_DIR := frameworks/native/include/media/openmax
-OMX_CORE_DIR := hardware/qcom/camera/mm-image-codec
+OMX_CORE_DIR := device/asus/flo/camera/mm-image-codec
LOCAL_C_INCLUDES := $(MM_JPEG_TEST_PATH)
LOCAL_C_INCLUDES += $(MM_JPEG_TEST_PATH)/../inc
