diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-18 15:40:14 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-18 15:40:26 +0100 |
| commit | 5fe9b2c621b08a16b00e7080c30b9875155fdc43 (patch) | |
| tree | 91b3a5569c4300bff48e3ba935b9d8d9634a4593 /camera/Android.mk | |
| parent | 062cf13b091d82edc08f3d8fa8bfa3961aae9ee2 (diff) | |
| download | device_samsung_smdk4412-common-5fe9b2c621b08a16b00e7080c30b9875155fdc43.tar.gz device_samsung_smdk4412-common-5fe9b2c621b08a16b00e7080c30b9875155fdc43.tar.bz2 device_samsung_smdk4412-common-5fe9b2c621b08a16b00e7080c30b9875155fdc43.zip | |
camera: switch to CyanogenMod's version of the free software camera
Replicant's version locks up, sometimes already after taking only one picture.
CyanogenMod's camera seems more stable.
Only the preview format was changed to RGB565.
TODO: Incorporate fixes from both version.
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Diffstat (limited to 'camera/Android.mk')
| -rw-r--r-- | camera/Android.mk | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index 60bd5d7..a830b3d 100644 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -1,4 +1,5 @@ -# Copyright (C) 2013-2014 Paul Kocialkowski <contact@paulk.fr> +# +# Copyright (C) 2013 Paul Kocialkowski # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,26 +22,31 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - smdk4x12_camera.c \ - smdk4x12_exif.c \ - smdk4x12_jpeg.c \ - smdk4x12_param.c \ - smdk4x12_utils.c \ - smdk4x12_v4l2.c \ - smdk4x12_v4l2_output.c \ - smdk4x12_ion.c + exynos_camera.c \ + exynos_exif.c \ + exynos_jpeg.c \ + exynos_param.c \ + exynos_utils.c \ + exynos_v4l2.c \ + exynos_v4l2_output.c LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include \ system/media/camera/include \ hardware/samsung/exynos4/hal/include -LOCAL_CFLAGS += -DEXYNOS_ION - -LOCAL_SHARED_LIBRARIES := libutils libcutils liblog libcamera_client libhardware libhwjpeg +LOCAL_SHARED_LIBRARIES := libutils libcutils liblog libcamera_client libhardware LOCAL_PRELINK_MODULE := false -LOCAL_MODULE := camera.smdk4x12 +ifeq ($(TARGET_SOC),exynos4x12) + LOCAL_SHARED_LIBRARIES += libhwjpeg + LOCAL_CFLAGS += -DEXYNOS_JPEG_HW + + LOCAL_SRC_FILES += exynos_ion.c + LOCAL_CFLAGS += -DEXYNOS_ION +endif + +LOCAL_MODULE := camera.$(TARGET_BOOTLOADER_BOARD_NAME) LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw LOCAL_MODULE_TAGS := optional |