summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2010-11-16 19:14:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-16 19:14:42 -0800
commit13da302e55bb7c3f58f9eac424d3fffdbbb1ebd5 (patch)
treeb92c858f1a031bd3e1ce788923cb6721172917f4
parentab7b6dc13a9bcbd9cfb1aa0bde486d59b91d8842 (diff)
parent327b68567595bad776f2d7e4d0d7cd2d49eca55a (diff)
downloaddevice_samsung_crespo-13da302e55bb7c3f58f9eac424d3fffdbbb1ebd5.zip
device_samsung_crespo-13da302e55bb7c3f58f9eac424d3fffdbbb1ebd5.tar.gz
device_samsung_crespo-13da302e55bb7c3f58f9eac424d3fffdbbb1ebd5.tar.bz2
am 327b6856: Remove ALSA configuration files from system image
* commit '327b68567595bad776f2d7e4d0d7cd2d49eca55a': Remove ALSA configuration files from system image
-rw-r--r--CleanSpec.mk5
-rw-r--r--device.mk21
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 4289d2c..d57f4a2 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 \