From 09fd358ac4c58964b6bb59ad0c197d8736288247 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Thu, 30 Oct 2014 20:39:41 -0700 Subject: camera: Allow hardware/camera.h header to be overridden Change-Id: I715ba261de0b01e61cbfe7cacd567a9f511fb8cb --- services/camera/libcameraservice/CameraService.h | 2 +- services/camera/libcameraservice/device1/CameraHardwareInterface.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index b56c161..f6fc0b1 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include "hardware/camera.h" #include #include diff --git a/services/camera/libcameraservice/device1/CameraHardwareInterface.h b/services/camera/libcameraservice/device1/CameraHardwareInterface.h index 7f14cd4..49dacbf 100644 --- a/services/camera/libcameraservice/device1/CameraHardwareInterface.h +++ b/services/camera/libcameraservice/device1/CameraHardwareInterface.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include "hardware/camera.h" namespace android { -- cgit v1.1