diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-07-30 17:57:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-30 17:57:56 +0000 |
| commit | 1ba3f933c4dce0b102963d2d1c290f4c0e85745c (patch) | |
| tree | f73b3b5f2906dd61afb7ba06e5d124e97a151ff2 | |
| parent | 0f82f5a73a9ea6462706c807dc1a5a2cf2333ea1 (diff) | |
| parent | 48bb03fad356184c52607dfbae065511785e5eb4 (diff) | |
| download | libhardware-1ba3f933c4dce0b102963d2d1c290f4c0e85745c.tar.gz | |
Merge "Camera2 tests: Update paths to camera service"
| -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 84450984..eb29c68e 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 66c4847d..2923de9c 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 ef4a9a52..acf41e10 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 44d3e3bf..e01cea49 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 164e0e54..69ee274d 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" |