summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--[-rwxr-xr-x]v3/Android.mk9
-rw-r--r--[-rwxr-xr-x]v3/EmulatedFakeCamera3.cpp52
-rw-r--r--[-rwxr-xr-x]v3/EmulatedFakeCamera3.h3
-rw-r--r--v3/LoadXml.cpp208
-rw-r--r--v3/LoadXml.h48
5 files changed, 298 insertions, 22 deletions
diff --git a/v3/Android.mk b/v3/Android.mk
index c6ddc9a..47680f2 100755..100644
--- a/v3/Android.mk
+++ b/v3/Android.mk
@@ -55,7 +55,8 @@ LOCAL_SHARED_LIBRARIES:= \
libui \
libdl \
libjpeg \
- libjhead
+ libjhead \
+ libexpat
# JPEG conversion libraries and includes.
LOCAL_SHARED_LIBRARIES += \
@@ -73,7 +74,8 @@ LOCAL_C_INCLUDES += external/jpeg \
$(TOP)/system/core/libion/kernel-headers \
$(TOP)/hardware/amlogic/gralloc \
$(LOCAL_PATH)/inc \
- $(call include-path-for, camera)
+ $(call include-path-for, camera) \
+ $(TOP)/external/expat/lib \
LOCAL_SRC_FILES := \
EmulatedCameraHal.cpp \
@@ -101,7 +103,8 @@ LOCAL_SRC_FILES := \
EmulatedFakeCamera3.cpp \
EmulatedFakeCamera3Info.cpp \
fake-pipeline2/camera_hw.cpp \
- VendorTags.cpp
+ VendorTags.cpp \
+ LoadXml.cpp \
ifeq ($(TARGET_PRODUCT),vbox_x86)
LOCAL_MODULE := camera.vbox_x86