From 25bcd01818898e2292e96ca8435c28991a2f778f Mon Sep 17 00:00:00 2001 From: Max Weffers Date: Mon, 30 Apr 2018 09:55:18 +0200 Subject: shinano: Use the new generated shim EDIT: Bring in line with upstream Change-Id: Ic4435dd9a225dcc01ff73a0d9ec7078213249ea0 --- BoardConfigCommon.mk | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 45ac60a..a122349 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -78,17 +78,6 @@ TARGET_KEYMASTER_WAIT_FOR_QSEE := true BOARD_SEPOLICY_DIRS += \ device/sony/shinano-common/sepolicy -# 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/libGraphicBuffer.so \ - /system/lib/hw/camera.vendor.qcom.so|libsensor.so - # Props for hotplugging TARGET_SYSTEM_PROP += device/sony/shinano-common/system.prop @@ -110,6 +99,18 @@ WIFI_DRIVER_FW_PATH_STA := "/vendor/firmware/fw_bcmdhd.bin" BOARD_NFC_CHIPSET := pn547 BOARD_NFC_DEVICE := /dev/pn547 +# 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 + # Filesystem BOARD_FLASH_BLOCK_SIZE := 131072 TARGET_USERIMAGES_USE_EXT4 := true -- cgit v1.2.3