From 93ebcc2fa2c4f571b454f597e1431db060058a08 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Fri, 25 Apr 2025 00:11:03 +0300
Subject: [PATCH] config: Move camera override format from reserved to select()

Change-Id: Ic8453eb9ef5fcd5b9bbfe22a8bb8100be2644e2d
---
 build/soong/Android.bp     | 17 -----------------
 config/BoardConfigSoong.mk | 12 ++++++------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index e870f62f..c1951dc7 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -77,23 +77,6 @@ cc_library_headers {
 }
 
 // Target platform agnostic config modules
-soong_config_module_type {
-    name: "camera_override_format_from_reserved",
-    module_type: "cc_defaults",
-    config_namespace: "lineageGlobalVars",
-    bool_variables: ["camera_override_format_from_reserved"],
-    properties: ["cppflags"],
-}
-
-camera_override_format_from_reserved {
-    name: "camera_override_format_from_reserved_defaults",
-    soong_config_variables: {
-        camera_override_format_from_reserved: {
-            cppflags: ["-DTARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED"],
-        },
-    },
-}
-
 soong_config_module_type {
     name: "gralloc_10_usage_bits",
     module_type: "cc_defaults",
diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index fea8f011..5e7313f1 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -28,19 +28,19 @@ $(foreach v,$(EXPORT_TO_SOONG),$(eval $(call addVar,$(v))))
 
 SOONG_CONFIG_NAMESPACES += lineageGlobalVars
 SOONG_CONFIG_lineageGlobalVars += \
-    additional_gralloc_10_usage_bits \
-    camera_override_format_from_reserved
-
-# Soong bool variables
-SOONG_CONFIG_lineageGlobalVars_camera_override_format_from_reserved := $(TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED)
+    additional_gralloc_10_usage_bits
 
 # Set default values
 TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS ?= 0
-TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED ?= false
 
 # Soong value variables
 SOONG_CONFIG_lineageGlobalVars_additional_gralloc_10_usage_bits := $(TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS)
 
+# Camera
+ifneq ($(TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED),)
+    $(call soong_config_set,camera,override_format_from_reserved,$(TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED))
+endif
+
 # Lineage Health HAL
 ifneq ($(TARGET_HEALTH_CHARGING_CONTROL_CHARGING_PATH),)
     $(call soong_config_set,lineage_health,charging_control_charging_path,$(TARGET_HEALTH_CHARGING_CONTROL_CHARGING_PATH))