aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BoardConfigCommon.mk11
-rw-r--r--rootdir/init.camera.rc10
2 files changed, 11 insertions, 10 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index be7c3b4..45ac60a 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -78,6 +78,17 @@ 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
diff --git a/rootdir/init.camera.rc b/rootdir/init.camera.rc
index 0f12b5b..c14d9c7 100644
--- a/rootdir/init.camera.rc
+++ b/rootdir/init.camera.rc
@@ -15,16 +15,6 @@
#
on init
-export 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 \
-"
on early-fs
wait /dev/block/mmcblk0p1