From b43a5b2435ee59020df2c9add06d736e4f8c016b Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Tue, 31 Jan 2017 12:20:44 -0800 Subject: [PATCH] Bluetooth: Move AsyncFdWatcher tests to the device Darwin builds were breaking. Test: compile, unit tests pass Change-Id: Ia00f590fe56211e25dff8d3138ebd93a306cf2c6 --- bluetooth/1.0/default/Android.bp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/bluetooth/1.0/default/Android.bp b/bluetooth/1.0/default/Android.bp index a99cd9e21f..4af079e462 100644 --- a/bluetooth/1.0/default/Android.bp +++ b/bluetooth/1.0/default/Android.bp @@ -35,12 +35,25 @@ cc_library_shared { ], } -cc_test_host { +cc_test { name: "bluetooth-vendor-interface-unit-tests", srcs: [ "async_fd_watcher.cc", - "bluetooth_address.cc", "test/async_fd_watcher_unittest.cc", + ], + local_include_dirs: [ + "test", + ], + shared_libs: [ + "libbase", + "liblog", + ], +} + +cc_test_host { + name: "bluetooth-address-unit-tests", + srcs: [ + "bluetooth_address.cc", "test/bluetooth_address_test.cc", "test/properties.cc", ],