commit d56db1d2bee182d1851097a9c712712fc094d117
author Eino-Ville Talvala <etalvala@google.com> Thu Dec 17 16:50:35 2015 -0800
committer Eino-Ville Talvala <etalvala@google.com> Wed Mar 02 10:27:36 2016 -0800
tree 243fda59e2b4d51491af628b49b3a35b267e0051
parent cf7913e2389a5e850e01aa6f905d252ee54c9891

Camera: Switch camera2 to auto-gen C++ binder interfaces

 - Move camera service AIDL files to frameworks/av
 - Build C++ interface stubs with AIDL tools
 - Add necessary native-side parcelables and update existing ones
 - Remove manually-written stubs, rearrange remaining manual stubs
 - Adjust implementations to work with auto-generated stubs
   - Adjust method signatures for auto-gen differences
   - Add rich error messages using binder::Status

Bug: 25091611
Change-Id: I6f69f34b9d1a3f8d1fb7db87357363f8fa8483ff

camera/cameraserver/Android.mk

diff --git a/camera/cameraserver/Android.mk b/camera/cameraserver/Android.mk
index 4d8339c..0207505 100644
--- a/camera/cameraserver/Android.mk
+++ b/camera/cameraserver/Android.mk
@@ -23,11 +23,8 @@
 	libcameraservice \
 	libcutils \
 	libutils \
-	libbinder
-
-LOCAL_C_INCLUDES := \
-    frameworks/av/services/camera/libcameraservice \
-    system/media/camera/include
+	libbinder \
+	libcamera_client
 
 LOCAL_MODULE:= cameraserver
 LOCAL_32_BIT_ONLY := true