diff options
author | Steven Moreland | 2017-04-13 16:19:19 -0500 |
---|---|---|
committer | Steven Moreland | 2017-04-19 17:15:07 -0500 |
commit | 1c11c98d5edd8803a637ba58b94de55724a32603 (patch) | |
tree | 390142d947defb13693e77e0b4bb3d08834c9222 | |
parent | f37bea87e8ef2f8797089a5294b695f2a649f882 (diff) | |
download | platform-hardware-interfaces-1c11c98d5edd8803a637ba58b94de55724a32603.tar.gz platform-hardware-interfaces-1c11c98d5edd8803a637ba58b94de55724a32603.tar.xz platform-hardware-interfaces-1c11c98d5edd8803a637ba58b94de55724a32603.zip |
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
(cherry picked from commit 2cfae52a2e479c1dc91caa2b0ae365718bb8e6fc)
Merged-In: I856838fe208a4cd038ea16d47f03f6278224b2ee
Change-Id: I856838fe208a4cd038ea16d47f03f6278224b2ee
-rw-r--r-- | bluetooth/1.0/default/Android.bp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bluetooth/1.0/default/Android.bp b/bluetooth/1.0/default/Android.bp index c77f0e6b..fec2264d 100644 --- a/bluetooth/1.0/default/Android.bp +++ b/bluetooth/1.0/default/Android.bp | |||
@@ -16,7 +16,7 @@ | |||
16 | cc_library_shared { | 16 | cc_library_shared { |
17 | name: "android.hardware.bluetooth@1.0-impl", | 17 | name: "android.hardware.bluetooth@1.0-impl", |
18 | defaults: ["hidl_defaults"], | 18 | defaults: ["hidl_defaults"], |
19 | proprietary: true, | 19 | vendor: true, |
20 | relative_install_path: "hw", | 20 | relative_install_path: "hw", |
21 | srcs: [ | 21 | srcs: [ |
22 | "bluetooth_hci.cc", | 22 | "bluetooth_hci.cc", |
@@ -41,7 +41,7 @@ cc_library_shared { | |||
41 | 41 | ||
42 | cc_library_static { | 42 | cc_library_static { |
43 | name: "android.hardware.bluetooth-async", | 43 | name: "android.hardware.bluetooth-async", |
44 | proprietary: true, | 44 | vendor: true, |
45 | defaults: ["hidl_defaults"], | 45 | defaults: ["hidl_defaults"], |
46 | srcs: [ | 46 | srcs: [ |
47 | "async_fd_watcher.cc", | 47 | "async_fd_watcher.cc", |
@@ -54,7 +54,7 @@ cc_library_static { | |||
54 | 54 | ||
55 | cc_library_static { | 55 | cc_library_static { |
56 | name: "android.hardware.bluetooth-hci", | 56 | name: "android.hardware.bluetooth-hci", |
57 | proprietary: true, | 57 | vendor: true, |
58 | defaults: ["hidl_defaults"], | 58 | defaults: ["hidl_defaults"], |
59 | srcs: [ | 59 | srcs: [ |
60 | "hci_packetizer.cc", | 60 | "hci_packetizer.cc", |
@@ -73,6 +73,7 @@ cc_library_static { | |||
73 | 73 | ||
74 | cc_test { | 74 | cc_test { |
75 | name: "bluetooth-vendor-interface-unit-tests", | 75 | name: "bluetooth-vendor-interface-unit-tests", |
76 | vendor: true, | ||
76 | defaults: ["hidl_defaults"], | 77 | defaults: ["hidl_defaults"], |
77 | srcs: [ | 78 | srcs: [ |
78 | "test/async_fd_watcher_unittest.cc", | 79 | "test/async_fd_watcher_unittest.cc", |