shinano-common: Clean shims up

* Move common TARGET_LD_SHIM_LIBS to msm8974-common

* Drop libsonycamera, simply replace the permission
  sed -i "s|com.sonyericsson.permission.CAMERA_EXTENDED|android.permission.CAMERA\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0|g" \
  lib/hw/camera.vendor.qcom.so

2 files changed, 5 insertions, 10 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index fe56047..d9a9bfc 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -93,16 +93,8 @@ WIFI_DRIVER_FW_PATH_AP      := "/vendor/firmware/fw_bcmdhd_apsta.bin"
 WIFI_DRIVER_FW_PATH_STA     := "/vendor/firmware/fw_bcmdhd.bin"
 
 # Shims
-TARGET_LD_SHIM_LIBS := \
-    /system/vendor/bin/credmgrd|/system/vendor/lib/libshims_signal.so \
-    /system/vendor/bin/iddd|/system/vendor/lib/libshims_idd.so \
-    /system/vendor/bin/suntrold|/system/vendor/lib/libshims_signal.so \
-    /system/lib/hw/camera.vendor.qcom.so|/system/vendor/lib/libsonycamera.so \
-    /system/vendor/bin/mm-qcamera-daemon|libandroid.so \
-    /system/lib/libcammw.so|libsensor.so \
-    /system/lib/libsomc_chokoballpal.so|/system/vendor/lib/libshim_camera.so \
-    /system/lib/libcald_pal.so|/system/vendor/lib/libshim_cald.so \
-    /system/lib/hw/camera.vendor.qcom.so|libsensor.so
+TARGET_LD_SHIM_LIBS += \
+    /system/lib/libsomc_chokoballpal.so|/system/vendor/lib/libshim_camera.so
 
 # Filesystem
 BOARD_FLASH_BLOCK_SIZE := 131072
diff --git a/shinano.mk b/shinano.mk
index 9ccd938..67e4959 100644
--- a/shinano.mk
+++ b/shinano.mk
@@ -59,6 +59,9 @@ PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/rootdir/sbin/tad_static:root/sbin/tad_static \
     $(COMMON_PATH)/rootdir/sbin/wait4tad_static:root/sbin/wait4tad_static
 
+PRODUCT_PACKAGES += \
+    libshim_camera
+
 PRODUCT_COPY_FILES += \
     $(COMMON_PATH)/rootdir/system/vendor/bin/credmgrfirstboot.sh:$(TARGET_COPY_OUT_VENDOR)/bin/credmgrfirstboot.sh