From 327b68567595bad776f2d7e4d0d7cd2d49eca55a Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Tue, 16 Nov 2010 15:24:45 -0800 Subject: Remove ALSA configuration files from system image Change-Id: I2236768b2c25d567742f2fdd9f68160c7d31ae02 --- CleanSpec.mk | 5 ++++- device.mk | 21 --------------------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 5d24448..0c9c31b 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -53,4 +53,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/obj/SHARED_LIBRAR $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/obj/SHARED_LIBRARIES/libaudio_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/obj/STATIC_LIBRARIES/libasound_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/obj/EXECUTABLES/alsa_*) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/system/bin/alsa_*) \ No newline at end of file +$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/system/bin/alsa_*) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/system/etc/asound.conf) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/system/usr/share/alsa) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/crespo/obj/PACKAGING/systemimage_intermediates) diff --git a/device.mk b/device.mk index 532bd6f..34d4c37 100644 --- a/device.mk +++ b/device.mk @@ -43,7 +43,6 @@ DEVICE_PACKAGE_OVERLAYS := device/samsung/crespo/overlay # These are the hardware-specific configuration files PRODUCT_COPY_FILES := \ - device/samsung/crespo/asound.conf:system/etc/asound.conf \ device/samsung/crespo/vold.fstab:system/etc/vold.fstab \ device/samsung/crespo/egl.cfg:system/lib/egl/egl.cfg @@ -70,26 +69,6 @@ PRODUCT_PACKAGES += \ PRODUCT_CHARACTERISTICS := nosdcard -# ALSA configuration files -PRODUCT_COPY_FILES += \ - device/samsung/crespo/alsa-lib/src/conf/alsa.conf:system/usr/share/alsa/alsa.conf \ - device/samsung/crespo/alsa-lib/src/conf/cards/aliases.conf:system/usr/share/alsa/cards/aliases.conf \ - device/samsung/crespo/alsa-lib/src/conf/pcm/center_lfe.conf:system/usr/share/alsa/pcm/center_lfe.conf \ - device/samsung/crespo/alsa-lib/src/conf/pcm/default.conf:system/usr/share/alsa/pcm/default.conf \ - device/samsung/crespo/alsa-lib/src/conf/pcm/dmix.conf:system/usr/share/alsa/pcm/dmix.conf \ - device/samsung/crespo/alsa-lib/src/conf/pcm/dpl.conf:system/usr/share/alsa/pcm/dpl.conf \ - device/samsung/crespo/alsa-lib/src/conf/pcm/dsnoop.conf:system/usr/share/alsa/pcm/dsnoop.conf \ - device/samsung/crespo/alsa-lib/src/conf/pcm/front.conf:system/usr/share/alsa/pcm/front.conf \ - device/samsung/crespo/alsa-lib/src/conf/pcm/iec958.conf:system/usr/share/alsa/pcm/iec958.conf \ - device/samsung/crespo/alsa-lib/src/conf/pcm/modem.conf:system/usr/share/alsa/pcm/modem.conf \ - device/samsung/crespo/alsa-lib/src/conf/pcm/rear.conf:system/usr/share/alsa/pcm/rear.conf \ - device/samsung/crespo/alsa-lib/src/conf/pcm/side.conf:system/usr/share/alsa/pcm/side.conf \ - device/samsung/crespo/alsa-lib/src/conf/pcm/surround40.conf:system/usr/share/alsa/pcm/surround40.conf \ - device/samsung/crespo/alsa-lib/src/conf/pcm/surround41.conf:system/usr/share/alsa/pcm/surround41.conf \ - device/samsung/crespo/alsa-lib/src/conf/pcm/surround50.conf:system/usr/share/alsa/pcm/surround50.conf \ - device/samsung/crespo/alsa-lib/src/conf/pcm/surround51.conf:system/usr/share/alsa/pcm/surround51.conf \ - device/samsung/crespo/alsa-lib/src/conf/pcm/surround71.conf:system/usr/share/alsa/pcm/surround71.conf - # These are the OpenMAX IL configuration files PRODUCT_COPY_FILES += \ device/samsung/crespo/sec_mm/sec_omx/sec_omx_core/secomxregistry:system/etc/secomxregistry \ -- cgit v1.1