universal7580: shim mediaserver

Change-Id: I86f9197ba5325d8ae1c85bd010befd86d84ebe50

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 175f63ad7b4f1278e9c07b4a85bf5b132371a27a..2e96bd25863725f2b3d14c5278692d0e208bf690 100644 (file)
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -189,3 +189,7 @@ BOARD_SEPOLICY_VERS := $(PLATFORM_SDK_VERSION).0
 
 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += $(LOCAL_PATH)
+
+# Shim
+TARGET_LD_SHIM_LIBS += \
+    /system/bin/mediaserver|/vendor/lib/libstagefright_shim.so

diff --git a/configs/init/mediaserver.rc b/configs/init/mediaserver.rc
deleted file mode 100644 (file)
index 13033f9..0000000
--- a/configs/init/mediaserver.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-service media /system/bin/mediaserver
-    class main
-    user media
-    group audio camera inet net_bt net_bt_admin net_bw_acct drmrpc mediadrm
-    ioprio rt 4
-    writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks
-    setenv LD_PRELOAD "/vendor/lib/libstagefright_shim.so"
\ No newline at end of file

diff --git a/device-common.mk b/device-common.mk
index 14a4e68ef35433e1e318e6b056e82886a9c1fd29..3949aa478c4cb7188b2e07783692b08fc3258b26 100644 (file)
--- a/device-common.mk
+++ b/device-common.mk
@@ -198,10 +198,6 @@ PRODUCT_PACKAGES += \
     wpa_supplicant.conf \
     android.hardware.wifi@1.0-service.legacy
 
-# Overriden service definition
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/init/mediaserver.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/mediaserver.rc
-
 # Properties
 -include $(LOCAL_PATH)/system_prop.mk