From 16a33ee8f6f0c7eac96262bf6f8e569ee9d9a6ee Mon Sep 17 00:00:00 2001
From: Iliyan Malchev <malchev@google.com>
Date: Fri, 5 Jun 2009 13:53:31 -0700
Subject: [PATCH] fix libcamera2 for master branch

Signed-off-by: Iliyan Malchev <malchev@google.com>
---
 libcamera2/Android.mk                 | 3 ++-
 libcamera2/QualcommCameraHardware.cpp | 2 +-
 libcamera2/QualcommCameraHardware.h   | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libcamera2/Android.mk b/libcamera2/Android.mk
index dab1c17..11e1350 100755
--- a/libcamera2/Android.mk
+++ b/libcamera2/Android.mk
@@ -1,4 +1,4 @@
-BUILD_LIBCAMERA:=
+BUILD_LIBCAMERA:=true
 ifeq ($(BUILD_LIBCAMERA),true)
 
 # When zero we link against libmmcamera; when 1, we dlopen libmmcamera.
@@ -22,6 +22,7 @@ LOCAL_C_INCLUDES+= \
 
 LOCAL_SHARED_LIBRARIES:= libutils libui liblog
 
+LOCAL_SHARED_LIBRARIES+= libbinder
 ifneq ($(DLOPEN_LIBMMCAMERA),1)
 LOCAL_SHARED_LIBRARIES+= libmmcamera
 else
diff --git a/libcamera2/QualcommCameraHardware.cpp b/libcamera2/QualcommCameraHardware.cpp
index c11ea89..030f914 100755
--- a/libcamera2/QualcommCameraHardware.cpp
+++ b/libcamera2/QualcommCameraHardware.cpp
@@ -21,7 +21,7 @@
 #include "QualcommCameraHardware.h"
 
 #include <utils/threads.h>
-#include <utils/MemoryHeapPmem.h>
+#include <binder/MemoryHeapPmem.h>
 #include <utils/String16.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/libcamera2/QualcommCameraHardware.h b/libcamera2/QualcommCameraHardware.h
index 06c38a2..2f75bf3 100755
--- a/libcamera2/QualcommCameraHardware.h
+++ b/libcamera2/QualcommCameraHardware.h
@@ -18,8 +18,8 @@
 #define ANDROID_HARDWARE_QUALCOMM_CAMERA_HARDWARE_H
 
 #include <ui/CameraHardwareInterface.h>
-#include <utils/MemoryBase.h>
-#include <utils/MemoryHeapBase.h>
+#include <binder/MemoryBase.h>
+#include <binder/MemoryHeapBase.h>
 #include <stdint.h>
 
 extern "C" {