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

Commit 806fa829 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 0cc92983: am 4e6f752f: Put soundpooled sounds in the right place. 

* commit '0cc92983':
  Put soundpooled sounds in the right place.
parents bbfd7e3c 0cc92983

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/usr/keylayout/frameworks) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/usr/keychars/frameworks)

$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/media/video/*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/effects/)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

data/sounds/AudioPackage12.mk

+1 −1
Original line number Diff line number Diff line
@@ -24,4 +24,4 @@ PRODUCT_COPY_FILES += $(foreach fn,$(RINGTONE_FILES),\ 
	$(LOCAL_PATH)/ringtones/ogg/$(fn).ogg:system/media/audio/ringtones/$(fn).ogg)



PRODUCT_COPY_FILES += $(foreach fn,$(EFFECT_FILES),\

	$(LOCAL_PATH)/effects/ogg/$(fn).ogg:system/media/audio/effects/$(fn).ogg)
 
	$(LOCAL_PATH)/effects/ogg/$(fn).ogg:system/media/audio/ui/$(fn).ogg)

data/sounds/AudioPackage12_48.mk

+6 −6
Original line number Diff line number Diff line
@@ -25,12 +25,12 @@ PRODUCT_COPY_FILES += $(foreach fn,$(RINGTONE_FILES),\ 
	$(LOCAL_PATH)/ringtones/ogg/$(fn)_48k.ogg:system/media/audio/ringtones/$(fn).ogg)



PRODUCT_COPY_FILES += $(foreach fn,$(EFFECT_FILES),\

	$(LOCAL_PATH)/effects/ogg/$(fn)_48k.ogg:system/media/audio/effects/$(fn).ogg)

	$(LOCAL_PATH)/effects/ogg/$(fn)_48k.ogg:system/media/audio/ui/$(fn).ogg)



# no gold-plated version yet

PRODUCT_COPY_FILES += \

    $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/effects/camera_focus.ogg \

    $(LOCAL_PATH)/effects/ogg/LowBattery.ogg:system/media/audio/effects/LowBattery.ogg \

    $(LOCAL_PATH)/effects/ogg/WirelessChargingStarted.ogg:system/media/audio/effects/WirelessChargingStarted.ogg \

    $(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/effects/Dock.ogg \

    $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/effects/Undock.ogg
 
    $(LOCAL_PATH)/effects/ogg/camera_focus.ogg:system/media/audio/ui/camera_focus.ogg \

    $(LOCAL_PATH)/effects/ogg/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \

    $(LOCAL_PATH)/effects/ogg/WirelessChargingStarted.ogg:system/media/audio/ui/WirelessChargingStarted.ogg \

    $(LOCAL_PATH)/effects/ogg/Dock.ogg:system/media/audio/ui/Dock.ogg \

    $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg