diff --git a/BoardConfig.mk b/BoardConfig.mk
index 7410258..875d63b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -214,6 +214,14 @@ TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_PATH)/releasetools
 # Sensor
 USE_SENSOR_MULTI_HAL := true
 
+# Shim
+TARGET_LD_SHIM_LIBS := \
+    /system/vendor/bin/adspd|libshim_adsp.so \
+    /system/lib/lib_motsensorlistener.so|libsensor.so \
+	/system/lib/libjustshoot.so|libshims_camera.so \
+	/system/vendor/lib/libguy.so|libshim_camera_hal.so \
+	/system/vendor/lib64/libmdmcutback.so|libqsap_shim.so
+
 # Wifi
 BOARD_HAS_QCOM_WLAN              := true
 BOARD_HAS_QCOM_WLAN_SDK          := true
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 1f02272..43e784b 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -57,9 +57,6 @@ on fs
     restorecon_recursive   /dsp
 
 on init
-    # Symbols required for motorola blobs
-    export LD_SHIM_LIBS /system/vendor/bin/adspd|libshim_adsp.so:/system/lib/lib_motsensorlistener.so|libsensor.so:/system/lib/libjustshoot.so|libshims_camera.so:/system/vendor/lib/libguy.so|libshim_camera_hal.so:/system/vendor/lib64/libmdmcutback.so|libqsap_shim.so
-
     write /sys/module/qpnp_rtc/parameters/poweron_alarm 1
 
     # Set permissions for persist partition