diff options
| author | Devin Moore <devinmoore@google.com> | 2023-01-18 17:27:49 +0000 |
|---|---|---|
| committer | Devin Moore <devinmoore@google.com> | 2023-01-18 20:18:30 +0000 |
| commit | 1dad0a69750a5c0c81553739f6bd1fb0aa0a9c73 (patch) | |
| tree | f0883a03a68c8835c9ef0d35bbd7dd587fbe64cc /apex | |
| parent | 09120082748f48723d275aaddecfe89abd37d56f (diff) | |
| download | cuttlefish-1dad0a69750a5c0c81553739f6bd1fb0aa0a9c73.tar.gz | |
Add AIDL default manifest to bluetooth apex
Also adding the process back into the apex .rc file.
This allows the service to start and register the interface.
Test: boot cuttlefish
Bug: 205758693
Change-Id: I206e20dc7fe9da730cb831c7b0fb90a026c82c5c
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/com.google.cf.bt/Android.bp | 1 | ||||
| -rw-r--r-- | apex/com.google.cf.bt/com.google.cf.bt.rc | 6 | ||||
| -rw-r--r-- | apex/com.google.cf.bt/file_contexts | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/apex/com.google.cf.bt/Android.bp b/apex/com.google.cf.bt/Android.bp index 8b406338b..d8b233775 100644 --- a/apex/com.google.cf.bt/Android.bp +++ b/apex/com.google.cf.bt/Android.bp @@ -40,4 +40,5 @@ apex { "android.hardware.bluetooth.prebuilt.xml", "com.google.cf.bt.rc", ], + vintf_fragments: [":manifest_android.hardware.bluetooth-service.default.xml"], } diff --git a/apex/com.google.cf.bt/com.google.cf.bt.rc b/apex/com.google.cf.bt/com.google.cf.bt.rc index 33a450dfd..8dca890bd 100644 --- a/apex/com.google.cf.bt/com.google.cf.bt.rc +++ b/apex/com.google.cf.bt/com.google.cf.bt.rc @@ -5,3 +5,9 @@ on property:apex.all.ready=true service bt_vhci_forwarder /apex/com.google.cf.bt/bin/bt_vhci_forwarder -virtio_console_dev=${vendor.ser.bt-uart} user bluetooth group bluetooth + +service btlinux /apex/com.google.cf.bt/bin/hw/android.hardware.bluetooth-service.default + class hal + user bluetooth + group bluetooth net_admin net_bt_admin + capabilities NET_ADMIN diff --git a/apex/com.google.cf.bt/file_contexts b/apex/com.google.cf.bt/file_contexts index b14875337..101c5b3dd 100644 --- a/apex/com.google.cf.bt/file_contexts +++ b/apex/com.google.cf.bt/file_contexts @@ -1,4 +1,4 @@ (/.*)? u:object_r:vendor_file:s0 -/bin/hw/android.hardware.bluetooth@1.1-service.btlinux u:object_r:hal_bluetooth_btlinux_exec:s0 +/bin/hw/android.hardware.bluetooth-service.default u:object_r:hal_bluetooth_btlinux_exec:s0 /bin/bt_vhci_forwarder u:object_r:bt_vhci_forwarder_exec:s0 -/etc/permissions(/.*)? u:object_r:vendor_configs_file:s0
\ No newline at end of file +/etc/permissions(/.*)? u:object_r:vendor_configs_file:s0 |