diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index ae7844b..c63f8d3 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -54,7 +54,6 @@ MALLOC_SVELTE := true
 MALLOC_SVELTE_FOR_LIBC32 := true
 TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED := true
 TARGET_CAMERA_PACKAGE_NAME := com.android.camera
-TARGET_CAMERA_SERVICE_EXT_LIB := //$(COMMON_PATH):libcameraservice_extension.sm6150
 
 # Filesystem
 TARGET_FS_CONFIG_GEN := $(COMMON_PATH)/configs/config.fs
diff --git a/sm6150.mk b/sm6150.mk
index 353ddfd..420c163 100644
--- a/sm6150.mk
+++ b/sm6150.mk
@@ -94,6 +94,8 @@ PRODUCT_PACKAGES += \
     libldacBT_enc
 
 # Camera
+$(call soong_config_set,libcameraservice,ext_lib,//$(LOCAL_PATH):libcameraservice_extension.sm6150)
+
 PRODUCT_PACKAGES += \
     android.hardware.camera.provider@2.4-impl \
     android.hardware.camera.provider@2.4-service_64