diff options
author | Andy Hung <hunga@google.com> | 2023-02-06 21:35:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-06 21:35:04 +0000 |
commit | 6766ca4760937e3f81db056236b4412c7503f112 (patch) | |
tree | 0468fa76f49f0593b3b1a2023dd841e6ed08c565 | |
parent | 2daabfee140c13a8882eea8db9d4af87c8d4ffbf (diff) | |
parent | f4871891b2ca624368afa8a2d0ffdebc7e31b865 (diff) | |
download | libhardware-6766ca4760937e3f81db056236b4412c7503f112.tar.gz |
Merge "HidRawDeviceTest: Enable for device build" am: 698fe8448b am: f4871891b2
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2404797
Change-Id: Iefe0f46e81d0964999b33d9f37abffe3e95caada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | modules/sensors/dynamic_sensor/Android.bp | 25 | ||||
-rw-r--r-- | modules/sensors/dynamic_sensor/test/HidRawDeviceTest.cpp | 7 |
2 files changed, 28 insertions, 4 deletions
diff --git a/modules/sensors/dynamic_sensor/Android.bp b/modules/sensors/dynamic_sensor/Android.bp index bad60481..890da82d 100644 --- a/modules/sensors/dynamic_sensor/Android.bp +++ b/modules/sensors/dynamic_sensor/Android.bp @@ -157,3 +157,28 @@ cc_binary_host { "test/HidRawDeviceTest.cpp", ], } + +// +// Android device test for HidRawDevice and HidRawSensor +// +// Assuming lunch target 1 +// $ cd test +// $ mma -j . +// $ adb push $ANDROID_BUILD_TOP/out/target/product/generic/vendor/bin/hidrawdevice_test /vendor/bin +// $ adb shell hidrawdevice_test /dev/hidraw0 +// +cc_binary { + name: "hidrawdevice_test", + defaults: ["dynamic_sensor_defaults"], + + srcs: [ + "test/HidRawDeviceTest.cpp", + ], + + cflags: ["-DLOG_TO_CONSOLE=1"], + + local_include_dirs: [ + "test", + "HidUtils/test", + ], +} diff --git a/modules/sensors/dynamic_sensor/test/HidRawDeviceTest.cpp b/modules/sensors/dynamic_sensor/test/HidRawDeviceTest.cpp index 2a68e39a..7522ca75 100644 --- a/modules/sensors/dynamic_sensor/test/HidRawDeviceTest.cpp +++ b/modules/sensors/dynamic_sensor/test/HidRawDeviceTest.cpp @@ -38,8 +38,7 @@ public: std::unordered_set<unsigned int> interestedUsage{ ACCELEROMETER_3D, GYROMETER_3D, COMPASS_3D, CUSTOM}; - SP(HidRawDevice) device = - std::make_shared<HidRawDevice>(std::string(devicePath), interestedUsage); + SP(HidRawDevice) device{new HidRawDevice(std::string(devicePath), interestedUsage)}; const HidDevice::HidDeviceInfo &info = device->getDeviceInfo(); LOG_V << "Sizeof descriptor: " << info.descriptor.size() << LOG_ENDL; @@ -69,8 +68,8 @@ public: // use HidRawSensor to operate the device, pick first digest // auto &reportDigest = device->mDigestVector[0]; - SP(HidRawSensor) sensor = std::make_shared<HidRawSensor>( - device, reportDigest.fullUsage, reportDigest.packets); + SP(HidRawSensor) sensor{ + new HidRawSensor(device, reportDigest.fullUsage, reportDigest.packets)}; if (!sensor->isValid()) { LOG_E << "Sensor is not valid " << LOG_ENDL; |