summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordhacker29 <davidhackerdvm@gmail.com>2013-11-20 20:18:17 -0600
committerEthan Chen <intervigil@gmail.com>2013-11-22 02:17:39 +0000
commit3dbb56527afcb183ae1aa81fc4ae78e479d0919f (patch)
treec3ff6e9e88c753c8d865f7b675819861180c135b
parent918821bba614ce4afb7ff20885125e90fdf572b2 (diff)
downloadvendor_replicant-3dbb56527afcb183ae1aa81fc4ae78e479d0919f.zip
vendor_replicant-3dbb56527afcb183ae1aa81fc4ae78e479d0919f.tar.gz
vendor_replicant-3dbb56527afcb183ae1aa81fc4ae78e479d0919f.tar.bz2
cm_audio: Rename Doink.oog to CyanDoink.oog to prevent override
PRODUCT_COPY_FILES vendor/cm/prebuilt/common/media/audio/ notifications/Doink.ogg:system/media/audio/notifications/Doink.ogg ignored. This is due to Doink.oog already existing in frameworks/base Change-Id: I7ab091680f9cb0fb349ff425cb3ee1273d32ee89
-rw-r--r--config/cm_audio.mk2
-rw-r--r--prebuilt/common/media/audio/notifications/CyanDoink.ogg (renamed from prebuilt/common/media/audio/notifications/Doink.ogg)bin10357 -> 10357 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/config/cm_audio.mk b/config/cm_audio.mk
index 1d1f0f7..b4aa316 100644
--- a/config/cm_audio.mk
+++ b/config/cm_audio.mk
@@ -14,9 +14,9 @@ PRODUCT_COPY_FILES += \
# Notifications
PRODUCT_COPY_FILES += \
+ $(NOTIFICATION_PATH)/CyanDoink.ogg:system/media/audio/notifications/CyanDoink.ogg \
$(NOTIFICATION_PATH)/CyanMail.ogg:system/media/audio/notifications/CyanMail.ogg \
$(NOTIFICATION_PATH)/CyanMessage.ogg:system/media/audio/notifications/CyanMessage.ogg \
- $(NOTIFICATION_PATH)/Doink.ogg:system/media/audio/notifications/Doink.ogg \
$(NOTIFICATION_PATH)/Laser.ogg:system/media/audio/notifications/Laser.ogg \
$(NOTIFICATION_PATH)/Naughty.ogg:system/media/audio/notifications/Naughty.ogg \
$(NOTIFICATION_PATH)/Pong.ogg:system/media/audio/notifications/Pong.ogg \
diff --git a/prebuilt/common/media/audio/notifications/Doink.ogg b/prebuilt/common/media/audio/notifications/CyanDoink.ogg
index fa95e69..fa95e69 100644
--- a/prebuilt/common/media/audio/notifications/Doink.ogg
+++ b/prebuilt/common/media/audio/notifications/CyanDoink.ogg
Binary files differ