summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--v3/Android.mk10
-rw-r--r--v3/EmulatedFakeCamera3.cpp29
-rw-r--r--v3/EmulatedFakeCamera3.h4
-rw-r--r--v3/LoadXml.cpp208
-rw-r--r--v3/LoadXml.h48
-rw-r--r--[-rwxr-xr-x]v3/QemuClient.h2
-rw-r--r--v3/fake-pipeline2/JpegCompressor.cpp328
-rw-r--r--v3/fake-pipeline2/JpegCompressor.h53
-rw-r--r--v3/fake-pipeline2/Sensor.cpp93
-rw-r--r--v3/inc/qemu_pipe.h94
-rw-r--r--v3/inc/qemud.h153
11 files changed, 362 insertions, 660 deletions
diff --git a/v3/Android.mk b/v3/Android.mk
index 4f465b7..11385c3 100644
--- a/v3/Android.mk
+++ b/v3/Android.mk
@@ -56,7 +56,6 @@ LOCAL_SHARED_LIBRARIES:= \
libui \
libdl \
libjpeg \
- libjhead \
libexpat \
libexif
@@ -124,7 +123,6 @@ LOCAL_SRC_FILES := \
EmulatedFakeCamera3Info.cpp \
fake-pipeline2/camera_hw.cpp \
VendorTags.cpp \
- LoadXml.cpp \
ifeq ($(TARGET_PRODUCT),vbox_x86)
LOCAL_MODULE := camera.vbox_x86
@@ -132,6 +130,10 @@ else
LOCAL_MODULE:= camera.amlogic
endif
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
include $(BUILD_SHARED_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))
@@ -176,6 +178,10 @@ LOCAL_SRC_FILES := JpegStub.cpp
LOCAL_MODULE := camera.goldfish.jpeg
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+endif
+
include $(BUILD_SHARED_LIBRARY)
endif # !PDK