Remove prebuilt sounds and include AudioPackage4.
diff --git a/prebuilt/passion/media/audio/ui/Dock.ogg b/prebuilt/passion/media/audio/ui/Dock.ogg
deleted file mode 100644
index 1462813..0000000
--- a/prebuilt/passion/media/audio/ui/Dock.ogg
+++ /dev/null
Binary files differ
diff --git a/prebuilt/passion/media/audio/ui/Lock.ogg b/prebuilt/passion/media/audio/ui/Lock.ogg
deleted file mode 100644
index e7928e4..0000000
--- a/prebuilt/passion/media/audio/ui/Lock.ogg
+++ /dev/null
Binary files differ
diff --git a/prebuilt/passion/media/audio/ui/LowBattery.ogg b/prebuilt/passion/media/audio/ui/LowBattery.ogg
deleted file mode 100644
index 68eb2c3..0000000
--- a/prebuilt/passion/media/audio/ui/LowBattery.ogg
+++ /dev/null
Binary files differ
diff --git a/prebuilt/passion/media/audio/ui/Undock.ogg b/prebuilt/passion/media/audio/ui/Undock.ogg
deleted file mode 100644
index 0053066..0000000
--- a/prebuilt/passion/media/audio/ui/Undock.ogg
+++ /dev/null
Binary files differ
diff --git a/prebuilt/passion/media/audio/ui/Unlock.ogg b/prebuilt/passion/media/audio/ui/Unlock.ogg
deleted file mode 100644
index cca9594..0000000
--- a/prebuilt/passion/media/audio/ui/Unlock.ogg
+++ /dev/null
Binary files differ
diff --git a/products/common.mk b/products/common.mk
index 5180857..2ae3fe5 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -23,6 +23,9 @@
# Allow the use of overlays
PRODUCT_PACKAGE_OVERLAYS := vendor/cyanogen/overlay
+# Bring in some audio files
+include frameworks/base/data/sounds/AudioPackage4.mk
+
PRODUCT_COPY_FILES += \
vendor/cyanogen/prebuilt/common/lib/libncurses.so:system/lib/libncurses.so \
vendor/cyanogen/prebuilt/common/etc/resolv.conf:system/etc/resolv.conf \
@@ -83,9 +86,9 @@
vendor/cyanogen/proprietary/com.google.android.maps.jar:./system/framework/com.google.android.maps.jar \
vendor/cyanogen/proprietary/libinterstitial.so:./system/lib/libinterstitial.so \
vendor/cyanogen/proprietary/libspeech.so:./system/lib/libspeech.so
-else
+else
PRODUCT_PACKAGES += \
Provision \
GoogleSearch \
LatinIME
-endif
\ No newline at end of file
+endif
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index 115e8d7..8b6d822 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -30,9 +30,4 @@
# Copy passion specific prebuilt files
#
PRODUCT_COPY_FILES += \
- vendor/cyanogen/prebuilt/passion/media/bootanimation.zip:system/media/bootanimation.zip \
- vendor/cyanogen/prebuilt/passion/media/audio/ui/Dock.ogg:system/media/audio/ui/Dock.ogg \
- vendor/cyanogen/prebuilt/passion/media/audio/ui/Lock.ogg:system/media/audio/ui/Lock.ogg \
- vendor/cyanogen/prebuilt/passion/media/audio/ui/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \
- vendor/cyanogen/prebuilt/passion/media/audio/ui/Undock.ogg:system/media/audio/ui/Undock.ogg \
- vendor/cyanogen/prebuilt/passion/media/audio/ui/Unlock.ogg:system/media/audio/ui/Unlock.ogg
+ vendor/cyanogen/prebuilt/passion/media/bootanimation.zip:system/media/bootanimation.zip