diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 75067fb..6dd20c3 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -213,7 +213,7 @@ BOARD_SEPOLICY_DIRS += $(VENDOR_PATH)/sepolicy
 
 # Shims
 TARGET_LD_SHIM_LIBS := \
-    /system/lib/hw/camera.vendor.msm8952.so|libcamera_parameters_shim.so \
+    /system/lib/hw/camera.vendor.msm8952.so|libshims_camera.so \
     /system/lib64/libsec-ril.so|libshims_rild_socket.so \
     /system/vendor/lib64/libizat_core.so|libshims_get_process_name.so
 
diff --git a/camera/Android.mk b/camera/Android.mk
index b706d6b..ae58142 100644
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -37,9 +37,10 @@ include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
-    CameraParameters.cpp
+    CameraParameters.cpp \
+    Fence.cpp
 
-LOCAL_MODULE := libcamera_parameters_shim
+LOCAL_MODULE := libshims_camera
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_TAGS := optional
 
diff --git a/camera/Fence.cpp b/camera/Fence.cpp
new file mode 100644
index 0000000..46524dd
--- /dev/null
+++ b/camera/Fence.cpp
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2018 The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+extern "C" void _ZN7android5FenceD1Ev() { }
diff --git a/msm8976.mk b/msm8976.mk
index 6cd8583..04b8f90 100644
--- a/msm8976.mk
+++ b/msm8976.mk
@@ -121,7 +121,7 @@ PRODUCT_PACKAGES += \
     android.hardware.camera.provider@2.4-impl-legacy \
     android.hardware.camera.provider@2.4-service \
     camera.msm8952 \
-    libcamera_parameters_shim
+    libshims_camera
 
 # DRM
 PRODUCT_PACKAGES += \