Add Lyric camera IQ tuning configuration.

Bug: 200221875
Test: build and check camera HAL APEX content for affected devices
Change-Id: Ic3b9c50fa63b656f7e5a42d2687f4e6775720e55
Merged-In: Ic3b9c50fa63b656f7e5a42d2687f4e6775720e55
diff --git a/device.mk b/device.mk
index 3f288ce..33865d6 100644
--- a/device.mk
+++ b/device.mk
@@ -478,17 +478,6 @@
 	android.hardware.drm@1.4-service.widevine \
 	liboemcrypto \
 
-ORIOLE_PRODUCT := %oriole
-RAVEN_PRODUCT := %raven
-ifneq (,$(filter $(ORIOLE_PRODUCT), $(TARGET_PRODUCT)))
-        LOCAL_TARGET_PRODUCT := oriole
-else ifneq (,$(filter $(RAVEN_PRODUCT), $(TARGET_PRODUCT)))
-        LOCAL_TARGET_PRODUCT := raven
-else
-        LOCAL_TARGET_PRODUCT := slider
-endif
-
-
 SOONG_CONFIG_NAMESPACES += google3a_config
 SOONG_CONFIG_google3a_config += \
 	soc \
@@ -499,7 +488,6 @@
 SOONG_CONFIG_google3a_config_soc := gs101
 SOONG_CONFIG_google3a_config_gcam_awb := true
 SOONG_CONFIG_google3a_config_ghawb_truetone := true
-SOONG_CONFIG_google3a_config_target_device := $(LOCAL_TARGET_PRODUCT)
 
 # Determine if Lyric is in the tree, and only have GCH build against it
 # if it is. Cases when Lyric isn't going to be in the tree:
@@ -512,8 +500,14 @@
 
 ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),)
 SOONG_CONFIG_NAMESPACES += lyric
-SOONG_CONFIG_lyric += use_lyric_camera_hal
+SOONG_CONFIG_lyric += \
+	use_lyric_camera_hal \
+	tuning_product
+
+SOONG_CONFIG_lyric_soc := gs101
 SOONG_CONFIG_lyric_use_lyric_camera_hal := true
+# SOONG_CONFIG_lyric_tuning_product is set in device-specific makefiles,
+# such as device/google/raviole/device-oriole.mk
 
 # Camera HAL library selection
 SOONG_CONFIG_NAMESPACES += gch