diff --git a/camera/camera.mk b/camera/camera.mk
new file mode 100644
index 0000000..6b2a553
--- /dev/null
+++ b/camera/camera.mk
@@ -0,0 +1,24 @@
+#
+# Copyright (C) 2023 The Android Open-Source 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.
+#
+
+ifeq ($(CAMERA_PRODUCT),)
+$(error CAMERA_PRODUCT is not set.)
+endif
+
+# go/lyric-soong-variables
+$(call soong_config_set,lyric,camera_hardware,$(CAMERA_PRODUCT))
+$(call soong_config_set,lyric,tuning_product,$(CAMERA_PRODUCT))
+$(call soong_config_set,google3a_config,target_device,$(CAMERA_PRODUCT))
diff --git a/device-husky.mk b/device-husky.mk
index e5cf797..ff1d01b 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -42,7 +42,10 @@ PRODUCT_COPY_FILES += \
 	device/google/shusky/husky/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb \
     device/google/shusky/husky/display_golden_google-hk3_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-hk3_cal0.pb
 
+CAMERA_PRODUCT ?= husky
+
 include device/google/shusky/audio/husky/audio-tables.mk
+include device/google/shusky/camera/camera.mk
 include device/google/zuma/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
@@ -50,11 +53,6 @@ include device/google/gs-common/touch/stm/stm20.mk
 include device/google/gs-common/touch/gti/gti.mk
 include device/google/gs-common/touch/touchinspector/touchinspector.mk
 
-# go/lyric-soong-variables
-$(call soong_config_set,lyric,camera_hardware,husky)
-$(call soong_config_set,lyric,tuning_product,husky)
-$(call soong_config_set,google3a_config,target_device,husky)
-
 # Init files
 PRODUCT_COPY_FILES += \
 	device/google/shusky/conf/init.husky.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.husky.rc
diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk
index 6196cb1..89eabbd 100644
--- a/device-ripcurrent.mk
+++ b/device-ripcurrent.mk
@@ -30,18 +30,16 @@ $(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-
 $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/ripcurrent/device-vendor-ripcurrent.mk)
 $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
 
+CAMERA_PRODUCT ?= ripcurrent
+
 include device/google/shusky/audio/ripcurrent/audio-tables.mk
+include device/google/shusky/camera/camera.mk
 include device/google/zuma/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/gps/brcm/cbd_gps.mk
 include device/google/gs-common/touch/stm/stm20.mk
 
-# go/lyric-soong-variables
-$(call soong_config_set,lyric,camera_hardware,ripcurrent)
-$(call soong_config_set,lyric,tuning_product,ripcurrent)
-$(call soong_config_set,google3a_config,target_device,ripcurrent)
-
 # display
 DEVICE_PACKAGE_OVERLAYS += device/google/shusky/ripcurrent/overlay
 
diff --git a/device-shiba.mk b/device-shiba.mk
index 203bc9f..031cf94 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -30,18 +30,15 @@ $(call inherit-product-if-exists, vendor/google_devices/shiba/proprietary/device
 $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/WallpapersShiba.mk)
 
 DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay
+CAMERA_PRODUCT ?= shiba
 
 include device/google/shusky/audio/shiba/audio-tables.mk
+include device/google/shusky/camera/camera.mk
 include device/google/zuma/device-shipping-common.mk
 include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/gti/gti.mk
 
-# go/lyric-soong-variables
-$(call soong_config_set,lyric,camera_hardware,shiba)
-$(call soong_config_set,lyric,tuning_product,shiba)
-$(call soong_config_set,google3a_config,target_device,shiba)
-
 # Init files
 PRODUCT_COPY_FILES += \
 	device/google/shusky/conf/init.shiba.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.shiba.rc