diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2017-04-11 08:56:09 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2017-04-11 10:50:06 -0700 |
| commit | d88dfe8607af019186a309674d9081a056ed3daa (patch) | |
| tree | f25e5b360739e6791624fe5061e73e0d0d373c8e /tests | |
| parent | f08d9dff190ffc1b479bede0b6037cfb1a9cb7fa (diff) | |
| download | libhardware-d88dfe8607af019186a309674d9081a056ed3daa.tar.gz | |
libhardware: deprecate cutils/log.h
Replace cutils/log.h with log/log.h. Sort headers. Minimize conflicts.
Add missing required headers.
Test: compile
Bug: 34250038
Change-Id: I5c0f231cbfed90b73e0538c9d32ad3226c7cc5e4
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/camera2/CameraMetadataTests.cpp | 9 | ||||
| -rw-r--r-- | tests/nusensors/nusensors.cpp | 5 | ||||
| -rwxr-xr-x | 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 100755 --- 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" |