i9100: cleanup proprietary files

Change-Id: I109ae08305505dcf519d273fd3869a1aca977e3d

2 files changed, 16 insertions, 62 deletions

diff --git a/proprietary-common-files.txt b/proprietary-common-files.txt
index f4b5fec..5d01b39 100644
--- a/proprietary-common-files.txt
+++ b/proprietary-common-files.txt
@@ -1,47 +1,3 @@
-system/etc/audio/LVVEFS_Rx_Configuration.txt 
-system/etc/audio/LVVEFS_Tx_Configuration.txt 
-system/etc/audio/Rx_ControlParams_BLUETOOTH_HEADSET.txt 
-system/etc/audio/Rx_ControlParams_EARPIECE_WIDEBAND.txt 
-system/etc/audio/Rx_ControlParams_SPEAKER_WIDEBAND.txt 
-system/etc/audio/Rx_ControlParams_WIRED_HEADPHONE_WIDEBAND.txt 
-system/etc/audio/Rx_ControlParams_WIRED_HEADSET_WIDEBAND.txt 
-system/etc/audio/Tx_ControlParams_BLUETOOTH_HEADSET.txt 
-system/etc/audio/Tx_ControlParams_EARPIECE_WIDEBAND.txt 
-system/etc/audio/Tx_ControlParams_SPEAKER_WIDEBAND.txt 
-system/etc/audio/Tx_ControlParams_WIRED_HEADPHONE_WIDEBAND.txt 
-system/etc/audio/Tx_ControlParams_WIRED_HEADSET_WIDEBAND.txt 
-system/lib/hw/alsa.default.so 
-system/lib/hw/audio.primary.exynos4.so 
-system/lib/hw/audio_policy.exynos4.so 
-system/lib/lib_Samsung_Acoustic_Module_Llite.so 
-system/lib/lib_Samsung_Resampler.so 
-system/lib/lib_Samsung_Sound_Booster.so 
-system/lib/libasound.so 
-system/lib/liblvvefs.so 
-system/lib/libmediayamaha.so 
-system/lib/libmediayamaha_jni.so 
-system/lib/libmediayamaha_tuning_jni.so 
-system/lib/libmediayamahaservice.so 
-system/lib/libsamsungAcousticeq.so 
-system/lib/libsamsungSoundbooster.so 
-system/lib/libyamahasrc.so 
-system/usr/share/alsa/alsa.conf 
-system/usr/share/alsa/cards/aliases.conf 
-system/usr/share/alsa/pcm/center_lfe.conf 
-system/usr/share/alsa/pcm/default.conf 
-system/usr/share/alsa/pcm/dmix.conf 
-system/usr/share/alsa/pcm/dpl.conf 
-system/usr/share/alsa/pcm/dsnoop.conf 
-system/usr/share/alsa/pcm/front.conf 
-system/usr/share/alsa/pcm/iec958.conf 
-system/usr/share/alsa/pcm/modem.conf 
-system/usr/share/alsa/pcm/rear.conf 
-system/usr/share/alsa/pcm/side.conf 
-system/usr/share/alsa/pcm/surround40.conf 
-system/usr/share/alsa/pcm/surround41.conf 
-system/usr/share/alsa/pcm/surround50.conf 
-system/usr/share/alsa/pcm/surround51.conf 
-system/usr/share/alsa/pcm/surround71.conf 
 system/cameradata/datapattern_420sp.yuv 
 system/cameradata/datapattern_front_420sp.yuv 
 system/lib/libcaps.so 
@@ -49,7 +5,6 @@ system/vendor/firmware/mfc_fw.bin
 system/lib/egl/libEGL_mali.so 
 system/lib/egl/libGLESv1_CM_mali.so 
 system/lib/egl/libGLESv2_mali.so 
-system/lib/hw/gralloc.exynos4.so 
 system/lib/libMali.so 
 system/lib/libUMP.so 
 system/lib/libsecion.so
@@ -64,5 +19,4 @@ system/lib/libhdmiclient.so
 system/lib/libtvout_jni.so 
 system/lib/libtvoutinterface.so 
 system/lib/libtvoutservice.so 
-system/lib/hw/hwcomposer.smdk4210.so 
 system/vendor/firmware/libpn544_fw.so 
diff --git a/proprietary-files.sh b/proprietary-files.sh
index 650ffa8..488c9bd 100755
--- a/proprietary-files.sh
+++ b/proprietary-files.sh
@@ -60,12 +60,12 @@ done
 # limitations under the License.
 
 PRODUCT_PACKAGES += \\
-	libTVOut \\
-	libfimc \\
-	libhdmi \\
-	libhdmiclient \\
-    libmediayamahaservice \\
-	libsecion
+    libTVOut \\
+    libUMP \\
+    libfimc \\
+    libhdmi \\
+    libhdmiclient \\
+    libsecion
 
 PRODUCT_COPY_FILES += \\
     vendor/__VENDOR__/__COMMON__/proprietary/system/lib/hw/camera.exynos4.so:system/lib/hw/vendor-camera.exynos4.so \\
@@ -111,9 +111,9 @@ LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib
 include \$(BUILD_PREBUILT)
 
 include \$(CLEAR_VARS)
-LOCAL_MODULE := libsecion
+LOCAL_MODULE := libUMP
 LOCAL_MODULE_OWNER := samsung
-LOCAL_SRC_FILES := system/lib/libsecion.so
+LOCAL_SRC_FILES := system/lib/libUMP.so
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := .so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
@@ -121,9 +121,9 @@ LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib
 include \$(BUILD_PREBUILT)
 
 include \$(CLEAR_VARS)
-LOCAL_MODULE := libfimc
+LOCAL_MODULE := libsecion
 LOCAL_MODULE_OWNER := samsung
-LOCAL_SRC_FILES := system/lib/libfimc.so
+LOCAL_SRC_FILES := system/lib/libsecion.so
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := .so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
@@ -131,9 +131,9 @@ LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib
 include \$(BUILD_PREBUILT)
 
 include \$(CLEAR_VARS)
-LOCAL_MODULE := libhdmi
+LOCAL_MODULE := libfimc
 LOCAL_MODULE_OWNER := samsung
-LOCAL_SRC_FILES := system/lib/libhdmi.so
+LOCAL_SRC_FILES := system/lib/libfimc.so
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := .so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
@@ -141,9 +141,9 @@ LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib
 include \$(BUILD_PREBUILT)
 
 include \$(CLEAR_VARS)
-LOCAL_MODULE := libhdmiclient
+LOCAL_MODULE := libhdmi
 LOCAL_MODULE_OWNER := samsung
-LOCAL_SRC_FILES := system/lib/libhdmiclient.so
+LOCAL_SRC_FILES := system/lib/libhdmi.so
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := .so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
@@ -151,9 +151,9 @@ LOCAL_MODULE_PATH := \$(TARGET_OUT)/lib
 include \$(BUILD_PREBUILT)
 
 include \$(CLEAR_VARS)
-LOCAL_MODULE := libmediayamahaservice
+LOCAL_MODULE := libhdmiclient
 LOCAL_MODULE_OWNER := samsung
-LOCAL_SRC_FILES := system/lib/libmediayamahaservice.so
+LOCAL_SRC_FILES := system/lib/libhdmiclient.so
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_SUFFIX := .so
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES