From e78191d1c2f1e6f765751925519fc7d60ec57def Mon Sep 17 00:00:00 2001 From: Shalaj Jain Date: Mon, 30 Jul 2012 15:57:16 -0700 Subject: [PATCH] Revert "common: Add target specific mediaprofiles" This reverts commit 7b603689c8a96c457a2d191b5c83506214f3bd22. --- Android.mk | 27 -- common.mk | 3 + media/media_profiles_7627a.xml | 627 --------------------------------- 3 files changed, 3 insertions(+), 654 deletions(-) delete mode 100644 media/media_profiles_7627a.xml diff --git a/Android.mk b/Android.mk index 327a85ca..65711611 100644 --- a/Android.mk +++ b/Android.mk @@ -1,28 +1 @@ -MEDIA_PATH := $(call my-dir) - include $(all-subdir-makefiles) - -ifeq ($(call is-board-platform-in-list,msm8960 msm8660 msm7627a msm7630_surf msm7630_fusion),true) - -LOCAL_PATH := $(MEDIA_PATH) - -######################## -include $(CLEAR_VARS) - -ifeq ($(call is-board-platform,msm7627a),true) - LOCAL_SRC_FILES := media/media_profiles_7627a.xml -else ifeq ($(call is-board-platform-in-list,msm8960 msm8660 msm7630_surf msm7630_fusion),true) - LOCAL_SRC_FILES := media/media_profiles.xml -endif - -LOCAL_MODULE := media_profiles.xml - -LOCAL_MODULE_TAGS := optional - -# This will install the file in /system/etc -# -LOCAL_MODULE_CLASS := ETC - -include $(BUILD_PREBUILT) -endif - diff --git a/common.mk b/common.mk index fe49488f..89654738 100644 --- a/common.mk +++ b/common.mk @@ -499,6 +499,9 @@ PRODUCT_COPY_FILES := \ system/bluetooth/data/iop_device_list.conf:system/etc/bluetooth/iop_device_list.conf \ # packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml \ +PRODUCT_COPY_FILES += device/qcom/common/media/media_profiles.xml:system/etc/media_profiles.xml \ + device/qcom/common/media/media_codecs.xml:system/etc/media_codecs.xml + # enable overlays to use our version of # source/resources etc. PRODUCT_PACKAGE_OVERLAYS := device/qcom/common/overlay diff --git a/media/media_profiles_7627a.xml b/media/media_profiles_7627a.xml deleted file mode 100644 index ac283d15..00000000 --- a/media/media_profiles_7627a.xml +++ /dev/null @@ -1,627 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -