fix libcamera2 for master branch

Signed-off-by: Iliyan Malchev <malchev@google.com>
This commit is contained in:
Iliyan Malchev 2009-06-05 13:53:31 -07:00
parent 23ef3090e3
commit 16a33ee8f6
3 changed files with 5 additions and 4 deletions

View File

@ -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

View File

@ -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>

View File

@ -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" {