diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-12 22:19:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-12 22:19:00 +0000 |
| commit | f217db06293d437f32c477b0e814a920c56ed8c6 (patch) | |
| tree | bbc8cb243911463d97b470beeb92c0ef65ed58ca /vendor.mk | |
| parent | 0a4f40767131d13b285aa4eb870a37d575284580 (diff) | |
| parent | 080ebd916ac852db2468e9253b08941fefd5805d (diff) | |
| download | device_generic_goldfish-f217db06293d437f32c477b0e814a920c56ed8c6.tar.gz device_generic_goldfish-f217db06293d437f32c477b0e814a920c56ed8c6.tar.bz2 device_generic_goldfish-f217db06293d437f32c477b0e814a920c56ed8c6.zip | |
Merge "Migrate goldfish audio HAL to HIDL" into rvc-dev
Diffstat (limited to 'vendor.mk')
| -rw-r--r-- | vendor.mk | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -40,7 +40,6 @@ PRODUCT_PACKAGES += \ libgoldfish-rild \ libril-goldfish-fork \ qemu-props \ - audio.primary.goldfish \ stagefright \ fingerprint.ranchu \ android.hardware.graphics.composer@2.3-impl \ @@ -76,7 +75,7 @@ endif PRODUCT_PACKAGES += \ audio.r_submix.default \ android.hardware.audio.service \ - android.hardware.audio@6.0-impl:32 \ + android.hardware.audio@6.0-impl.ranchu \ android.hardware.audio.effect@6.0-impl:32 PRODUCT_PACKAGES += \ @@ -286,13 +285,10 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.autofill.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.autofill.xml \ frameworks/native/data/etc/android.software.verified_boot.xml:${TARGET_COPY_OUT_PRODUCT}/etc/permissions/android.software.verified_boot.xml \ frameworks/av/media/libeffects/data/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ - device/generic/goldfish/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf \ - frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - frameworks/av/services/audiopolicy/config/primary_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml \ - frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ + device/generic/goldfish/audio/policy/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + device/generic/goldfish/audio/policy/primary_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ - frameworks/av/services/audiopolicy/config/surround_sound_configuration_5_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/surround_sound_configuration_5_0.xml \ device/generic/goldfish/data/etc/permissions/privapp-permissions-goldfish.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-goldfish.xml \ hardware/google/camera/devices/EmulatedCamera/hwl/configs/emu_camera_back.json:$(TARGET_COPY_OUT_VENDOR)/etc/config/emu_camera_back.json \ hardware/google/camera/devices/EmulatedCamera/hwl/configs/emu_camera_front.json:$(TARGET_COPY_OUT_VENDOR)/etc/config/emu_camera_front.json \ |