diff options
author | Mark Salyzyn <salyzyn@google.com> | 2017-04-12 08:56:20 -0700 |
---|---|---|
committer | Mark Salyzyn <salyzyn@google.com> | 2017-04-12 09:11:38 -0700 |
commit | 1ae7379baab4b2941ad1701190718cf53a051b48 (patch) | |
tree | 74cd60feb4b9388ff04dadbe0f933b13fce36f42 /tests | |
parent | 9e610d1a3be65117f478f59f3ef4c38c5295afb6 (diff) | |
parent | 7c451a9347f39b82113d5cfae36bf4de67c5171a (diff) | |
download | libhardware-1ae7379baab4b2941ad1701190718cf53a051b48.tar.gz |
resolve merge conflicts of 7c451a93 to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: 34250038
Change-Id: I4196a6d5a1365106643ac6c1548fd86faffead6f
Diffstat (limited to 'tests')
-rw-r--r-- | tests/camera2/CameraMetadataTests.cpp | 9 | ||||
-rw-r--r-- | tests/nusensors/nusensors.cpp | 5 | ||||
-rw-r--r-- | tests/vehicle/vehicle-hal-tool.c | 6 |
3 files changed, 13 insertions, 7 deletions
diff --git a/tests/camera2/CameraMetadataTests.cpp b/tests/camera2/CameraMetadataTests.cpp index da5b7483..16b2dd9c 100644 --- a/tests/camera2/CameraMetadataTests.cpp +++ b/tests/camera2/CameraMetadataTests.cpp @@ -16,8 +16,13 @@ #define LOG_NDEBUG 0 #define LOG_TAG "CameraMetadataTestFunctional" -#include "cutils/log.h" + +#include <stdint.h> + +#include <string> + #include "cutils/properties.h" +#include "log/log.h" #include "utils/Errors.h" #include "gtest/gtest.h" @@ -31,8 +36,6 @@ #include <gui/CpuConsumer.h> #include <gui/Surface.h> -#include <string> - #include "CameraStreamFixture.h" #include "TestExtensions.h" diff --git a/tests/nusensors/nusensors.cpp b/tests/nusensors/nusensors.cpp index 55b77850..a063959d 100644 --- a/tests/nusensors/nusensors.cpp +++ b/tests/nusensors/nusensors.cpp @@ -17,14 +17,15 @@ #include <inttypes.h> #include <string.h> #include <stdint.h> +#include <stdio.h> #include <string.h> #include <sys/cdefs.h> #include <sys/types.h> -#include <cutils/log.h> +#include <log/log.h> +#include <utils/Timers.h> #include <hardware/sensors.h> -#include <utils/Timers.h> char const* getSensorName(int type) { switch(type) { diff --git a/tests/vehicle/vehicle-hal-tool.c b/tests/vehicle/vehicle-hal-tool.c index e85df621..94624d34 100644 --- a/tests/vehicle/vehicle-hal-tool.c +++ b/tests/vehicle/vehicle-hal-tool.c @@ -17,13 +17,15 @@ #define LOG_TAG "vehicle-hal-tool" #include <inttypes.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> + +#include <log/log.h> + #include <hardware/hardware.h> #include <hardware/vehicle.h> -#include <cutils/log.h> - void usage() { printf("Usage: " "./vehicle-hal-tool [-l] [-m -p -t [-v]]\n" |