| -rw-r--r-- | v3/Android.mk | 15 | ||||
| -rw-r--r-- | v3/fake-pipeline2/Sensor.cpp | 65 | ||||
| -rw-r--r-- | v3/libamljpeg_static.a | 8538 | ||||
| -rw-r--r-- | v3/libconvert_static.a | 5129 |
4 files changed, 19 insertions, 13728 deletions
diff --git a/v3/Android.mk b/v3/Android.mk index 8296414..335bbd3 100644 --- a/v3/Android.mk +++ b/v3/Android.mk @@ -17,14 +17,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_PREBUILT_LIBS := \ - libconvert_static.a \ - libamljpeg_static.a - -include $(BUILD_MULTI_PREBUILT) - -include $(CLEAR_VARS) - LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_CFLAGS += -fno-short-enums -DQEMU_HARDWARE LOCAL_CFLAGS += -Wno-unused-parameter -Wno-missing-field-initializers @@ -63,9 +55,9 @@ LOCAL_SHARED_LIBRARIES:= \ libion \ libui \ libdl \ + libjpeg \ libjhead \ libexpat - #libjpeg \ # JPEG conversion libraries and includes. LOCAL_SHARED_LIBRARIES += \ @@ -73,8 +65,7 @@ LOCAL_SHARED_LIBRARIES += \ libcamera_metadata LOCAL_STATIC_LIBRARIES := \ - libconvert_static \ - libamljpeg_static + libyuv_static \ LOCAL_KK=0 ifeq ($(GPU_TYPE),t83x) @@ -94,13 +85,13 @@ MESON_GRALLOC_DIR ?= hardware/amlogic/gralloc LOCAL_C_INCLUDES += external/jpeg \ external/jhead/ \ frameworks/native/include/media/hardware \ + external/libyuv/files/include/ \ $(TOP)/system/core/libion/include \ $(TOP)/system/core/libion/kernel-headers \ $(TOP)/$(MESON_GRALLOC_DIR) \ $(LOCAL_PATH)/inc \ $(call include-path-for, camera) \ $(TOP)/external/expat/lib \ - #external/libyuv/files/include/ \ LOCAL_SRC_FILES := \ EmulatedCameraHal.cpp \ |