diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-07-25 17:09:14 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2013-07-29 09:55:23 -0700 |
| commit | 48bb03fad356184c52607dfbae065511785e5eb4 (patch) | |
| tree | ef570f6e48a247a840529523f10c7baaabc1a10a /tests/camera2 | |
| parent | ba9c8badb7683f76eaa3f40f3b930410682bab69 (diff) | |
| download | hardware_libhardware-48bb03fad356184c52607dfbae065511785e5eb4.zip hardware_libhardware-48bb03fad356184c52607dfbae065511785e5eb4.tar.gz hardware_libhardware-48bb03fad356184c52607dfbae065511785e5eb4.tar.bz2 | |
Camera2 tests: Update paths to camera service
Change-Id: Ic50ea977194073e3768c22a5f21eb15f430fa2f5
Diffstat (limited to 'tests/camera2')
| -rw-r--r-- | tests/camera2/CameraFrameTests.cpp | 5 | ||||
| -rw-r--r-- | tests/camera2/CameraMetadataTests.cpp | 2 | ||||
| -rw-r--r-- | tests/camera2/CameraModuleFixture.h | 5 | ||||
| -rw-r--r-- | tests/camera2/CameraModuleTests.cpp | 4 | ||||
| -rw-r--r-- | tests/camera2/CameraStreamTests.cpp | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/tests/camera2/CameraFrameTests.cpp b/tests/camera2/CameraFrameTests.cpp index 8445098..eb29c68 100644 --- a/tests/camera2/CameraFrameTests.cpp +++ b/tests/camera2/CameraFrameTests.cpp @@ -23,9 +23,8 @@ #include "hardware/hardware.h" #include "hardware/camera2.h" -#include "CameraDeviceBase.h" -#include "utils/StrongPointer.h" - +#include <common/CameraDeviceBase.h> +#include <utils/StrongPointer.h> #include <gui/CpuConsumer.h> #include <gui/Surface.h> diff --git a/tests/camera2/CameraMetadataTests.cpp b/tests/camera2/CameraMetadataTests.cpp index 66c4847..2923de9 100644 --- a/tests/camera2/CameraMetadataTests.cpp +++ b/tests/camera2/CameraMetadataTests.cpp @@ -25,7 +25,7 @@ #include "hardware/hardware.h" #include "hardware/camera2.h" -#include "CameraDeviceBase.h" +#include "common/CameraDeviceBase.h" #include "utils/StrongPointer.h" #include <gui/CpuConsumer.h> diff --git a/tests/camera2/CameraModuleFixture.h b/tests/camera2/CameraModuleFixture.h index ef4a9a5..acf41e1 100644 --- a/tests/camera2/CameraModuleFixture.h +++ b/tests/camera2/CameraModuleFixture.h @@ -22,8 +22,9 @@ #include "hardware/hardware.h" #include "hardware/camera2.h" -#include "Camera2Device.h" -#include "Camera3Device.h" +#include <device2/Camera2Device.h> +#include <device3/Camera3Device.h> + #include "camera2_utils.h" #include "TestExtensions.h" diff --git a/tests/camera2/CameraModuleTests.cpp b/tests/camera2/CameraModuleTests.cpp index 44d3e3b..e01cea4 100644 --- a/tests/camera2/CameraModuleTests.cpp +++ b/tests/camera2/CameraModuleTests.cpp @@ -19,12 +19,12 @@ #define LOG_TAG "CameraModuleTest" #define LOG_NDEBUG 0 #include <utils/Log.h> +#include <utils/StrongPointer.h> +#include <common/CameraDeviceBase.h> #include "hardware/hardware.h" #include "hardware/camera2.h" -#include "CameraDeviceBase.h" -#include "utils/StrongPointer.h" #include "CameraModuleFixture.h" namespace android { diff --git a/tests/camera2/CameraStreamTests.cpp b/tests/camera2/CameraStreamTests.cpp index 164e0e5..69ee274 100644 --- a/tests/camera2/CameraStreamTests.cpp +++ b/tests/camera2/CameraStreamTests.cpp @@ -25,12 +25,12 @@ #include "hardware/hardware.h" #include "hardware/camera2.h" -#include "Camera2Device.h" -#include "utils/StrongPointer.h" - +#include <utils/StrongPointer.h> #include <gui/CpuConsumer.h> #include <gui/Surface.h> +#include <device2/Camera2Device.h> + #include "CameraStreamFixture.h" #include "TestExtensions.h" |