diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2021-08-23 10:31:19 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2021-08-23 10:32:33 -0700 |
| commit | edf246933a124db54ec295135b198fa2225842c0 (patch) | |
| tree | 99fac3e86fcee0daf2eb0ff04bfc2bf616511d2c | |
| parent | 64e6ffc7c14c65e40ddc031770f8aef267819b6f (diff) | |
| download | poplar-edf246933a124db54ec295135b198fa2225842c0.tar.gz | |
poplar: Fix the build
Set manifest's target-level="3"
Set audio hal version to 4.0
Use sw gatekeeper
Use cuttlefish health hal
Bug: 197531125
Test: make -j24
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Change-Id: Ie49f4a48362ccb13507695c286363f94b3613cb3
| -rw-r--r-- | device.mk | 16 | ||||
| -rw-r--r-- | manifest.xml | 15 |
2 files changed, 15 insertions, 16 deletions
@@ -46,10 +46,10 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml ## build packages PRODUCT_PACKAGES += \ - android.hardware.audio@2.0-impl \ - android.hardware.audio@2.0-service \ - android.hardware.audio.effect@2.0-impl \ - android.hardware.soundtrigger@2.0-impl \ + android.hardware.audio@4.0-impl \ + android.hardware.audio@4.0-service \ + android.hardware.audio.effect@4.0-impl \ + android.hardware.soundtrigger@4.0-impl \ audio.a2dp.default \ audio.usb.default \ audio.r_submix.default \ @@ -177,6 +177,14 @@ PRODUCT_PROPERTY_OVERRIDES += \ wifi.interface=wlan0 \ wifi.supplicant_scan_interval=15 +# Cuttlefish Health HAL: +PRODUCT_PACKAGES += \ + android.hardware.health@2.1-impl-cuttlefish \ + android.hardware.health@2.1-service + +# Software Gatekeeper HAL +PRODUCT_PACKAGES += \ + android.hardware.gatekeeper@1.0-service.software # manifest.xml DEVICE_MANIFEST_FILE := $(LOCAL_PATH)/manifest.xml diff --git a/manifest.xml b/manifest.xml index 6a94f91..71fc9e3 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,8 +1,8 @@ -<manifest version="1.0" type="device"> +<manifest version="1.0" type="device" target-level="3"> <hal format="hidl"> <name>android.hardware.audio</name> <transport>hwbinder</transport> - <version>2.0</version> + <version>4.0</version> <interface> <name>IDevicesFactory</name> <instance>default</instance> @@ -11,7 +11,7 @@ <hal format="hidl"> <name>android.hardware.audio.effect</name> <transport>hwbinder</transport> - <version>2.0</version> + <version>4.0</version> <interface> <name>IEffectsFactory</name> <instance>default</instance> @@ -47,15 +47,6 @@ </interface> </hal> <hal format="hidl"> - <name>android.hardware.wifi</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IWifi</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> <name>android.hardware.graphics.composer</name> <transport>hwbinder</transport> <version>2.1</version> |