summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--inc/mjpeg/defs.h2
-rw-r--r--v3/Android.mk3
-rw-r--r--v3/fake-pipeline2/Sensor.cpp63
3 files changed, 55 insertions, 13 deletions
diff --git a/v3/Android.mk b/v3/Android.mk
index 8ab9013..88475ce 100644
--- a/v3/Android.mk
+++ b/v3/Android.mk
@@ -94,7 +94,6 @@ 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 \
@@ -124,8 +123,6 @@ 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