summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Ray <aray@google.com>2012-06-27 15:17:51 -0700
committerAlex Ray <aray@google.com>2012-07-10 16:48:41 -0700
commit5278039afffb2057fe81ef5972c120eefaff201b (patch)
tree5e3e1b65311ff450c558750c891de968f0f32331
parent48bac8e5ed7f9f782d18774414cdc706f9e5b56a (diff)
downloadexynos5-5278039afffb2057fe81ef5972c120eefaff201b.tar.gz
hardware: samsung_slsi: Android.mk use camera v2
Change-Id: I9c1f75f5fbc806c2f23a0e72fdd5f27091f10b7f
-rw-r--r--Android.mk1
-rw-r--r--libcamera/Android.mk2
-rw-r--r--libcamera2/Android.mk2
3 files changed, 2 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index ca37b62..3656a1e 100644
--- 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 5253ab8..d46dff4 100644
--- 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 3ab03d0..d72fe38 100644
--- 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