summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-08-26 23:02:06 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-08-26 23:02:06 +0000
commit68342097a3bc388b5c7fd0c2db3739041b9d28e6 (patch)
tree2a354967aba496ca534adf57c3c9c02ce2c055a8
parentbf4efb6acf2db5bb8c950d8a4557bf93de1d7f4a (diff)
parent0cc45e9124b7224f80c042b02865727460015273 (diff)
downloaddevice_google_trout-68342097a3bc388b5c7fd0c2db3739041b9d28e6.tar.gz
device_google_trout-68342097a3bc388b5c7fd0c2db3739041b9d28e6.tar.bz2
device_google_trout-68342097a3bc388b5c7fd0c2db3739041b9d28e6.zip
Snap for 6793271 from 0cc45e9124b7224f80c042b02865727460015273 to rvc-qpr1-release
Change-Id: I76437da5b2e70c1b35d9631f567ac65f3b770c1a
-rw-r--r--aosp_trout_common.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/aosp_trout_common.mk b/aosp_trout_common.mk
index 626cb20..2ed4079 100644
--- a/aosp_trout_common.mk
+++ b/aosp_trout_common.mk
@@ -23,6 +23,8 @@ LOCAL_AUDIO_PRODUCT_PACKAGE ?= \
android.hardware.audio.service \
android.hardware.soundtrigger@2.3-impl
LOCAL_AUDIO_DEVICE_PACKAGE_OVERLAYS ?= device/google/trout/hal/audio/6.0/overlay
+LOCAL_AUDIO_PROPERTIES ?= \
+ ro.hardware.audio.primary=trout \
# Audio Control HAL
LOCAL_AUDIOCONTROL_HAL_PRODUCT_PACKAGE ?= android.hardware.audiocontrol@2.0-service.trout
@@ -44,6 +46,7 @@ TARGET_VULKAN_SUPPORT := false
PRODUCT_PROPERTY_OVERRIDES += \
ro.hardware.type=automotive \
+ ${LOCAL_AUDIO_PROPERTIES} \
${LOCAL_AUDIOCONTROL_PROPERTIES} \
${LOCAL_DUMPSTATE_PROPERTIES}
@@ -62,5 +65,7 @@ LOCAL_AUDIO_PRODUCT_COPY_FILES ?= \
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/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
+PRODUCT_PACKAGES += tinyplay
+
# TODO(b/162901005): Include computepipe once this project points to main.
# include packages/services/Car/cpp/computepipe/products/computepipe.mk