commit 180698ccae5626aa2211475d2a04313a423f611c
author Yin-Chia Yeh <yinchiayeh@google.com> Thu Feb 02 18:21:29 2017 -0800
committer Yin-Chia Yeh <yinchiayeh@google.com> Fri Feb 03 14:45:37 2017 -0800
tree a0f353a2665e4e528108d6281a2130a9c2303971
parent 58655c6da608b5953483d17da3288ae12b405af1

Camera: rename HIDL wrappers

1. Rename camera device libraries
2. Remove the -binderized variants

Test: compile, camera app working in passthrough/binderized mode
Bug: 34817742
Change-Id: I01a9548f9a5e4744b5ec6eb5fb3fb0a9cb4938a5

common/base.mk

diff --git a/common/base.mk b/common/base.mk
index 1f67f4d..98b2da3 100644
--- a/common/base.mk
+++ b/common/base.mk
@@ -333,13 +333,12 @@
 LIBCAMERA += camera_test
 LIBCAMERA += org.codeaurora.camera
 
-# Enable passthrough camera HAL
+# Shared by passthrough/binderized camera HAL
+LIBCAMERA += camera.device@3.2-impl
 LIBCAMERA += android.hardware.camera.provider@2.4-impl
-LIBCAMERA += android.hardware.camera.device@3.2-impl
 
 # Enable binderized camera HAL
 LIBCAMERA += android.hardware.camera.provider@2.4-service
-LIBCAMERA += android.hardware.camera.device@3.2-impl-binderized
 
 #LIBCOPYBIT
 LIBCOPYBIT := copybit.msm8660