hardware: samsung_slsi: Android.mk use camera v2

Change-Id: I9c1f75f5fbc806c2f23a0e72fdd5f27091f10b7f

diff --git a/Android.mk b/Android.mk
index ca37b62c4cb95d3f4d127c35c398551c3bcdaf97..3656a1ef725f525b8c4bbd4dbe0188ff7d681c48 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -28,7 +28,6 @@ exynos5_dirs := \
        libswconverter \
        libv4l2 \
        libhwjpeg \
-       libcamera \
        libhwc \
        libcamera2
 

diff --git a/libcamera/Android.mk b/libcamera/Android.mk
index 5253ab8b6136ecdbb3e3749cf92ccb77d98bd956..d46dff422602eae0feff62a35297de33570f9ce7 100644 (file)
--- a/libcamera/Android.mk
+++ b/libcamera/Android.mk
@@ -20,7 +20,7 @@ LOCAL_CFLAGS += -DGAIA_FW_BETA
 
 LOCAL_SHARED_LIBRARIES += libexynosutils libhwjpeg libexynosv4l2 libcsc libion_exynos
 
-LOCAL_MODULE := camera.exynos5
+LOCAL_MODULE := oldcamera.exynos5
 
 LOCAL_MODULE_TAGS := optional
 

diff --git a/libcamera2/Android.mk b/libcamera2/Android.mk
index 3ab03d06a00be8e091859a3983d9cff69819199e..d72fe389e997de6d15d06e094b20add2fb5f086d 100644 (file)
--- a/libcamera2/Android.mk
+++ b/libcamera2/Android.mk
@@ -32,7 +32,7 @@ LOCAL_CFLAGS += -DGAIA_FW_BETA
 LOCAL_SHARED_LIBRARIES += libexynosutils libhwjpeg libexynosv4l2 libcsc libion_exynos libcamera_metadata
 #LOCAL_SHARED_LIBRARIES += libexynosutils libhwjpeg libexynosv4l2 libcsc libion libexynoscamera libcamera_metadata
 
-LOCAL_MODULE := camera2.exynos5
+LOCAL_MODULE := camera.exynos5
 
 LOCAL_MODULE_TAGS := optional