diff options
| author | Daniel Sandler <dsandler@android.com> | 2013-09-20 11:21:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-20 11:21:56 -0700 |
| commit | 806fa829b4d8cb1dc6520872f0d500c41d7eca17 (patch) | |
| tree | a7af477c6595361681efe29e5e87c2b26cbfcf76 | |
| parent | bbfd7e3ca23aee588941e380d46a6d9d36b1f71d (diff) | |
| parent | 0cc9298320fa6f018f0a2b7292057be46964c15c (diff) | |
am 0cc92983: am 4e6f752f: Put soundpooled sounds in the right place.
* commit '0cc9298320fa6f018f0a2b7292057be46964c15c':
Put soundpooled sounds in the right place.
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | data/sounds/AudioPackage12.mk | 2 | ||||
| -rw-r--r-- | data/sounds/AudioPackage12_48.mk | 12 |
3 files changed, 8 insertions, 7 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 54c43fb4dcea..4e9201527927 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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 # ************************************************ diff --git a/data/sounds/AudioPackage12.mk b/data/sounds/AudioPackage12.mk index 8cf94941fd3d..af89a821024a 100644 --- a/data/sounds/AudioPackage12.mk +++ b/data/sounds/AudioPackage12.mk @@ -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) diff --git a/data/sounds/AudioPackage12_48.mk b/data/sounds/AudioPackage12_48.mk index 6b7b796b2370..636bb9f07c40 100644 --- a/data/sounds/AudioPackage12_48.mk +++ b/data/sounds/AudioPackage12_48.mk @@ -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 |