summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--[-rwxr-xr-x]inc/mjpeg/defs.h2
-rw-r--r--v3/Android.mk5
-rw-r--r--v3/fake-pipeline2/Sensor.cpp12
3 files changed, 18 insertions, 1 deletions
diff --git a/v3/Android.mk b/v3/Android.mk
index 335bbd3..8ab9013 100644
--- a/v3/Android.mk
+++ b/v3/Android.mk
@@ -67,6 +67,8 @@ LOCAL_SHARED_LIBRARIES += \
LOCAL_STATIC_LIBRARIES := \
libyuv_static \
+LOCAL_CFLAGS += -DANDROID_PLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
+
LOCAL_KK=0
ifeq ($(GPU_TYPE),t83x)
LOCAL_KK:=1
@@ -92,6 +94,7 @@ LOCAL_C_INCLUDES += external/jpeg \
$(LOCAL_PATH)/inc \
$(call include-path-for, camera) \
$(TOP)/external/expat/lib \
+ $(LOCAL_PATH)/../inc/mjpeg/ \
LOCAL_SRC_FILES := \
EmulatedCameraHal.cpp \
@@ -121,6 +124,8 @@ LOCAL_SRC_FILES := \
fake-pipeline2/camera_hw.cpp \
VendorTags.cpp \
LoadXml.cpp \
+ ../mjpeg/jpegdec.c \
+ ../mjpeg/colorspaces.c \
ifeq ($(TARGET_PRODUCT),vbox_x86)
LOCAL_MODULE := camera.vbox_x86