diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-04 21:56:28 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-04 21:56:28 +0000 |
| commit | 4ffb88f9966d32ee4c471f2d53963d1d976aec5a (patch) | |
| tree | 0cdf78b939e63009266c285341a9fecafbce908e | |
| parent | b81f555904088c6639ecbc7189a3e1086ec2c79d (diff) | |
| parent | 3c2d4fa7273877aba87de562135c469aac2440d8 (diff) | |
| download | dragonboard-simpleperf-release.tar.gz | |
Snap for 11526323 from 3c2d4fa7273877aba87de562135c469aac2440d8 to simpleperf-releasesimpleperf-release
Change-Id: I2860318816a198b1e27b0381610e138f12ddb2af
| -rw-r--r-- | device-common.mk | 4 | ||||
| -rw-r--r-- | full.mk | 19 | ||||
| -rw-r--r-- | manifest.xml | 11 |
3 files changed, 18 insertions, 16 deletions
diff --git a/device-common.mk b/device-common.mk index fb3de7e..886f9e5 100644 --- a/device-common.mk +++ b/device-common.mk @@ -94,3 +94,7 @@ PRODUCT_COPY_FILES += \ device/linaro/dragonboard/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(TARGET_HARDWARE).rc \ device/linaro/dragonboard/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.$(TARGET_HARDWARE).usb.rc \ frameworks/base/data/keyboards/Generic.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/$(TARGET_HARDWARE).kl + +# Workaround for the drop of OMX service +PRODUCT_VENDOR_PROPERTIES += \ + debug.stagefright.c2inputsurface=-1 @@ -97,6 +97,12 @@ PRODUCT_PACKAGES += \ audio.usb.default \ audio.r_submix.default +# Bluetooth Audio AIDL HAL +PRODUCT_PACKAGES += \ + android.hardware.bluetooth.audio-impl \ +PRODUCT_COPY_FILES += \ + frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \ + # Build tinyalsa cli tools for debugging PRODUCT_PACKAGES += \ tinyplay \ @@ -104,12 +110,12 @@ PRODUCT_PACKAGES += \ tinymix \ tinypcminfo + # audio policy configuration USE_XML_AUDIO_POLICY_CONF := 1 PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/etc/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ $(LOCAL_PATH)/etc/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - $(LOCAL_PATH)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/primary_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml \ @@ -154,10 +160,11 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.gatekeeper@1.0-service.software -# Health -PRODUCT_PACKAGES += \ - android.hardware.health@2.1-impl-cuttlefish \ - android.hardware.health@2.1-service +# Health HAL +PRODUCT_PACKAGES += com.google.cf.health + +# Thermal HAL +PRODUCT_PACKAGES += com.android.hardware.thermal # TODO: disable this service once we implement system suspend PRODUCT_PACKAGES += \ @@ -181,7 +188,7 @@ PRODUCT_COPY_FILES += \ # Copy standard platform config files PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/ueventd.common.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \ + $(LOCAL_PATH)/ueventd.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc \ frameworks/native/data/etc/android.software.cts.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.cts.xml \ frameworks/native/data/etc/android.software.app_widgets.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.app_widgets.xml \ frameworks/native/data/etc/android.software.backup.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.backup.xml \ diff --git a/manifest.xml b/manifest.xml index db43cdd..8643532 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,4 +1,4 @@ -<manifest version="1.0" type="device" target-level="6"> +<manifest version="1.0" type="device" target-level="7"> <hal format="hidl"> <name>android.hardware.audio</name> <transport>hwbinder</transport> @@ -27,15 +27,6 @@ </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.camera.provider</name> <transport>hwbinder</transport> <impl level="generic"></impl> |