From 2cfae52a2e479c1dc91caa2b0ae365718bb8e6fc Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Thu, 13 Apr 2017 14:19:19 -0700 Subject: [PATCH] Move bluetooth test to vendor. The test is still built in data/nativetest64, but it must be marked as vendor since it depends on vendor modules. Also proprietary -> vendor. Test: build with BOARD_VNDK_VERSION := current Test: run test on internal marlin, passes Bug: 33241851 Change-Id: I856838fe208a4cd038ea16d47f03f6278224b2ee --- bluetooth/1.0/default/Android.bp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bluetooth/1.0/default/Android.bp b/bluetooth/1.0/default/Android.bp index c77f0e6b80..fec2264dc4 100644 --- a/bluetooth/1.0/default/Android.bp +++ b/bluetooth/1.0/default/Android.bp @@ -16,7 +16,7 @@ cc_library_shared { name: "android.hardware.bluetooth@1.0-impl", defaults: ["hidl_defaults"], - proprietary: true, + vendor: true, relative_install_path: "hw", srcs: [ "bluetooth_hci.cc", @@ -41,7 +41,7 @@ cc_library_shared { cc_library_static { name: "android.hardware.bluetooth-async", - proprietary: true, + vendor: true, defaults: ["hidl_defaults"], srcs: [ "async_fd_watcher.cc", @@ -54,7 +54,7 @@ cc_library_static { cc_library_static { name: "android.hardware.bluetooth-hci", - proprietary: true, + vendor: true, defaults: ["hidl_defaults"], srcs: [ "hci_packetizer.cc", @@ -73,6 +73,7 @@ cc_library_static { cc_test { name: "bluetooth-vendor-interface-unit-tests", + vendor: true, defaults: ["hidl_defaults"], srcs: [ "test/async_fd_watcher_unittest.cc",