Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f729e00 authored by Joshua Lang's avatar Joshua Lang Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'emu_audio_fixes' 

* changes:
  Add audio HIDL *-impl and -service libraries to product packages
  Add default audio_submix module to sdk_base build
  Switch video codec config xml to goldfish version
  Adding goldfish_audio_legacy hal to emulator build
  Switch emulator sdk build audio_conf to goldfish
parents d08fad39 149363c0

target/product/emulator.mk

+8 −0
Original line number Diff line number Diff line
@@ -47,12 +47,20 @@ PRODUCT_PACKAGES += \ 
    fingerprint.goldfish \

    sensors.goldfish \

    audio.primary.goldfish \

    audio.primary.goldfish_legacy \

    android.hardware.audio@2.0-service \

    vibrator.goldfish \

    power.goldfish \

    fingerprint.ranchu \

    android.hardware.biometrics.fingerprint@2.1-service \

    sensors.ranchu



PRODUCT_PACKAGES += \

    android.hardware.audio@2.0-impl \

    android.hardware.audio.effect@2.0-impl \

    android.hardware.broadcastradio@1.0-impl \

    android.hardware.soundtrigger@2.0-impl



PRODUCT_COPY_FILES += \

    device/generic/goldfish/fstab.goldfish:root/fstab.goldfish \

    device/generic/goldfish/init.goldfish.rc:root/init.goldfish.rc \

target/product/sdk_base.mk

+3 −2
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ PRODUCT_PACKAGES := \ 
# audio libraries.

PRODUCT_PACKAGES += \

	audio.primary.goldfish \

	audio.r_submix.default \

	local_time.default



PRODUCT_PACKAGE_OVERLAYS := development/sdk_overlay
@@ -68,14 +69,14 @@ PRODUCT_COPY_FILES := \ 
	device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \

	frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \

	frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \

	frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \

	device/generic/goldfish/camera/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \

	device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \

	device/generic/goldfish/camera/media_codecs_performance.xml:system/etc/media_codecs_performance.xml \

	frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \

	frameworks/native/data/etc/android.hardware.camera.xml:system/etc/permissions/android.hardware.camera.xml \

	frameworks/native/data/etc/android.hardware.fingerprint.xml:system/etc/permissions/android.hardware.fingerprint.xml \

	frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \

	hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf

	device/generic/goldfish/audio_policy.conf:system/etc/audio_policy.conf



include $(SRC_TARGET_DIR)/product/emulator.mk