diff options
| author | Ethan Chen <intervigil@gmail.com> | 2014-10-30 20:39:41 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-30 04:13:25 -0700 |
| commit | 09fd358ac4c58964b6bb59ad0c197d8736288247 (patch) | |
| tree | dbada95d0eadbe338cd29feff8147d2f05a8c357 /services/camera/libcameraservice | |
| parent | 57583fd581d96e5b6497cb3f7839a5f0c0b33613 (diff) | |
| download | frameworks_av-09fd358ac4c58964b6bb59ad0c197d8736288247.zip frameworks_av-09fd358ac4c58964b6bb59ad0c197d8736288247.tar.gz frameworks_av-09fd358ac4c58964b6bb59ad0c197d8736288247.tar.bz2 | |
camera: Allow hardware/camera.h header to be overridden
Change-Id: I715ba261de0b01e61cbfe7cacd567a9f511fb8cb
Diffstat (limited to 'services/camera/libcameraservice')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.h | 2 | ||||
| -rw-r--r-- | 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 <binder/BinderService.h> #include <binder/IAppOpsCallback.h> #include <camera/ICameraService.h> -#include <hardware/camera.h> +#include "hardware/camera.h" #include <camera/ICamera.h> #include <camera/ICameraClient.h> 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 <camera/Camera.h> #include <camera/CameraParameters.h> #include <system/window.h> -#include <hardware/camera.h> +#include "hardware/camera.h" namespace android { |