diff options
| author | Keun young Park <keunyoung@google.com> | 2020-04-09 16:25:28 -0700 |
|---|---|---|
| committer | Keun young Park <keunyoung@google.com> | 2020-04-10 10:10:16 -0700 |
| commit | d4e16b664466b76b3dca2af6d73bcc86ae668d2b (patch) | |
| tree | 53267a6314dca44316946bffd32f01cbf2aedfb2 /common | |
| parent | ac3e541870505e824fd27bff8a89430811fc2e89 (diff) | |
| download | device_generic_car-d4e16b664466b76b3dca2af6d73bcc86ae668d2b.tar.gz device_generic_car-d4e16b664466b76b3dca2af6d73bcc86ae668d2b.tar.bz2 device_generic_car-d4e16b664466b76b3dca2af6d73bcc86ae668d2b.zip | |
Remove deprecated radio hal and duplicate BT filecontexts
- Those brought build failures.
- Also update other audio related HAL version follwoing goldfish changes.
Bug: 153676180
Test: check build error
Change-Id: I24bb596edc74610e5aad2a7e3659bf559daf58ea
Diffstat (limited to 'common')
| -rw-r--r-- | common/car.mk | 2 | ||||
| -rw-r--r-- | common/manifest.xml | 49 | ||||
| -rw-r--r-- | common/sepolicy/file_contexts | 2 |
3 files changed, 20 insertions, 33 deletions
diff --git a/common/car.mk b/common/car.mk index bf1a4d2..495d03c 100644 --- a/common/car.mk +++ b/common/car.mk @@ -19,8 +19,6 @@ PRODUCT_PACKAGES += \ android.hardware.automotive.vehicle@2.0-service \ android.hardware.automotive.audiocontrol@2.0-service \ - android.hardware.bluetooth@1.1-service.sim \ - android.hardware.bluetooth.audio@2.0-impl \ # Emulator configuration PRODUCT_COPY_FILES += \ diff --git a/common/manifest.xml b/common/manifest.xml index 4430973..117b482 100644 --- a/common/manifest.xml +++ b/common/manifest.xml @@ -1,6 +1,24 @@ <!-- A copy of the goldfish manifest with the addition of vehicle hals. --> <manifest version="1.0" type="device" target-level="3"> <hal format="hidl"> + <name>android.hardware.bluetooth</name> + <transport>hwbinder</transport> + <version>1.1</version> + <interface> + <name>IBluetoothHci</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.bluetooth.audio</name> + <transport>hwbinder</transport> + <version>2.0</version> + <interface> + <name>IBluetoothAudioProvidersFactory</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> <name>android.hardware.drm</name> <transport>hwbinder</transport> <version>1.0</version> @@ -20,7 +38,7 @@ <hal format="hidl"> <name>android.hardware.audio.effect</name> <transport>hwbinder</transport> - <version>5.0</version> + <version>6.0</version> <interface> <name>IEffectsFactory</name> <instance>default</instance> @@ -45,27 +63,9 @@ </interface> </hal> <hal format="hidl"> - <name>android.hardware.bluetooth</name> - <transport>hwbinder</transport> - <version>1.1</version> - <interface> - <name>IBluetoothHci</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.bluetooth.audio</name> - <transport>hwbinder</transport> - <version>2.0</version> - <interface> - <name>IBluetoothAudioProvidersFactory</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> <name>android.hardware.audio</name> <transport>hwbinder</transport> - <version>5.0</version> + <version>6.0</version> <interface> <name>IDevicesFactory</name> <instance>default</instance> @@ -130,15 +130,6 @@ </interface> </hal> <hal format="hidl"> - <name>android.hardware.radio.deprecated</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IOemHook</name> - <instance>slot1</instance> - </interface> - </hal> - <hal format="hidl"> <name>android.hardware.radio</name> <transport>hwbinder</transport> <version>1.0</version> diff --git a/common/sepolicy/file_contexts b/common/sepolicy/file_contexts deleted file mode 100644 index ed5712b..0000000 --- a/common/sepolicy/file_contexts +++ /dev/null @@ -1,2 +0,0 @@ -# label the bluetooth@1.0-service.sim or it won't register during system boot -/vendor/bin/hw/android\.hardware\.bluetooth@1\.1-service\.sim u:object_r:hal_bluetooth_default_exec:s0 |