config: Move camera override format from reserved to select()

Change-Id: Ic8453eb9ef5fcd5b9bbfe22a8bb8100be2644e2d

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",

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))