diff options
| author | Jooyung Han <jooyung@google.com> | 2022-05-13 03:55:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-13 03:55:36 +0000 |
| commit | e169cc0b9e7797a988a03722d8dc965e2def32a9 (patch) | |
| tree | dd24bf1373d29abc4cbcf9e87f6da53bb6454bb2 /apex | |
| parent | 121ff8734c6d26ea96adfcd7a9f35e5ef88b9089 (diff) | |
| parent | 083d12810fc6293b2219e5edd9af42e8233561a0 (diff) | |
| download | cuttlefish-e169cc0b9e7797a988a03722d8dc965e2def32a9.tar.gz | |
Move trigger for bt_vhci_forwarder am: 4f379e3e22 am: 083d12810f
Original change: https://android-review.googlesource.com/c/device/google/cuttlefish/+/2092524
Change-Id: I57ed69cd99f485b94b4279523f11d7f38bd38be3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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/com.google.cf.bt.trig.rc | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/apex/com.google.cf.bt/Android.bp b/apex/com.google.cf.bt/Android.bp index 438db0282..5406755c2 100644 --- a/apex/com.google.cf.bt/Android.bp +++ b/apex/com.google.cf.bt/Android.bp @@ -40,6 +40,5 @@ apex { "android.hardware.bluetooth.prebuilt.xml", "com.google.cf.bt.rc", ], - init_rc: ["com.google.cf.bt.trig.rc"], vintf_fragments: [":manifest_android.hardware.bluetooth@1.1-service.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 a5f2ae755..0db8ddb07 100644 --- a/apex/com.google.cf.bt/com.google.cf.bt.rc +++ b/apex/com.google.cf.bt/com.google.cf.bt.rc @@ -1,3 +1,9 @@ +# start bt_vhci_forwarder at the earliest possible moment. +# apexd.status=ready indicates APEXes are ready to use. +# TODO(b/202731768) introduce a new trigger for APEX readiness +on property:apexd.status=ready + start bt_vhci_forwarder + service bt_vhci_forwarder /apex/com.google.cf.bt/bin/bt_vhci_forwarder -virtio_console_dev=${vendor.ser.bt-uart} user bluetooth group bluetooth diff --git a/apex/com.google.cf.bt/com.google.cf.bt.trig.rc b/apex/com.google.cf.bt/com.google.cf.bt.trig.rc deleted file mode 100644 index a082c186b..000000000 --- a/apex/com.google.cf.bt/com.google.cf.bt.trig.rc +++ /dev/null @@ -1,6 +0,0 @@ -## Init files within the APEX do not support triggers (b/202731768) -## By adding this as an init_rc parameter of the APEX the file will be installed -## outside of the APEX and instead be installed under /vendor/etc/init. -on post-fs-data - start bt_vhci_forwarder - |