From 8c51fca2237690a6090fca26d8f82f9ff78ba434 Mon Sep 17 00:00:00 2001 From: Stan Rokita Date: Tue, 4 Feb 2020 11:25:38 -0800 Subject: [PATCH] Build HalProxy unit tests with a test library ScopedWakelock Unit tests do not currently build because they cannot find the ScopedWakelock shared object. Make a test library version of ScopedWakelock for them. Test: Build and run atest android.hardware.sensors@2.0-halproxy-unit-tests Change-Id: Ie8d3eb606ccba3825be2c8102b9a7bc6ea033f65 --- sensors/2.0/multihal/Android.bp | 15 +++++++++++++++ sensors/2.0/multihal/tests/Android.bp | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sensors/2.0/multihal/Android.bp b/sensors/2.0/multihal/Android.bp index 24c475cb8c..b7fa15a3df 100644 --- a/sensors/2.0/multihal/Android.bp +++ b/sensors/2.0/multihal/Android.bp @@ -92,3 +92,18 @@ cc_test_library { "android.hardware.sensors@2.0-ScopedWakelock", ], } + +cc_test_library { + name: "android.hardware.sensors@2.0-ScopedWakelock.testlib", + defaults: [ + "hidl_defaults", + "android.hardware.sensors@2.0-multihal-defaults", + ], + srcs: [ + "ScopedWakelock.cpp", + ], + vendor_available: true, + export_header_lib_headers: [ + "android.hardware.sensors@2.0-multihal.header", + ], +} diff --git a/sensors/2.0/multihal/tests/Android.bp b/sensors/2.0/multihal/tests/Android.bp index a9feaf7b21..472f3f3509 100644 --- a/sensors/2.0/multihal/tests/Android.bp +++ b/sensors/2.0/multihal/tests/Android.bp @@ -80,11 +80,11 @@ cc_test { static_libs: [ "android.hardware.sensors@2.0-HalProxy", "android.hardware.sensors@2.0-fakesubhal-unittest", + "android.hardware.sensors@2.0-ScopedWakelock.testlib", ], shared_libs: [ "android.hardware.sensors@1.0", "android.hardware.sensors@2.0", - "android.hardware.sensors@2.0-ScopedWakelock", "libbase", "libcutils", "libfmq",