Use soong_config_ macros to set Soong config variables.

Bug: 198503843
Test: treehugger
Merged-In: Ifd1aed04267d952a13cfd9b93933e500ba07dbad
Change-Id: I4fa1d4f3e1c5a965696f78244bcf58360e0ce1c7

4 files changed, 29 insertions, 80 deletions

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index cb32eaf..d9cae70 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -111,40 +111,28 @@ BOARD_USES_SWIFTSHADER := false
 
 # Gralloc4
 ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4)
-SOONG_CONFIG_NAMESPACES += arm_gralloc
-SOONG_CONFIG_arm_gralloc := \
-	gralloc_arm_no_external_afbc \
-	mali_gpu_support_afbc_basic \
-	mali_gpu_support_afbc_wideblk \
-	gralloc_init_afbc \
-	gralloc_ion_sync_on_lock \
-	dpu_support_1010102_afbc
 
 ifeq ($(BOARD_USES_SWIFTSHADER),true)
-SOONG_CONFIG_arm_gralloc_gralloc_arm_no_external_afbc := true
-SOONG_CONFIG_arm_gralloc_mali_gpu_support_afbc_basic := false
-SOONG_CONFIG_arm_gralloc_mali_gpu_support_afbc_wideblk := false
-SOONG_CONFIG_arm_gralloc_gralloc_init_afbc := false
-SOONG_CONFIG_arm_gralloc_dpu_support_1010102_afbc := false
+$(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,true)
+$(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_basic,false)
+$(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_wideblk,false)
+$(call soong_config_set,arm_gralloc,gralloc_init_afbc,false)
+$(call soong_config_set,arm_gralloc,dpu_support_1010102_afbc,false)
 else
-SOONG_CONFIG_arm_gralloc_gralloc_arm_no_external_afbc := false
-SOONG_CONFIG_arm_gralloc_mali_gpu_support_afbc_basic := true
-SOONG_CONFIG_arm_gralloc_mali_gpu_support_afbc_wideblk := true
-SOONG_CONFIG_arm_gralloc_gralloc_init_afbc := true
-SOONG_CONFIG_arm_gralloc_dpu_support_1010102_afbc := true
+$(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,false)
+$(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_basic,true)
+$(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_wideblk,true)
+$(call soong_config_set,arm_gralloc,gralloc_init_afbc,true)
+$(call soong_config_set,arm_gralloc,dpu_support_1010102_afbc,true)
 endif # ifeq ($(BOARD_USES_SWIFTSHADER),true)
-SOONG_CONFIG_arm_gralloc_gralloc_ion_sync_on_lock := $(BOARD_USES_GRALLOC_ION_SYNC)
+$(call soong_config_set,arm_gralloc,gralloc_ion_sync_on_lock,$(BOARD_USES_GRALLOC_ION_SYNC))
 endif # ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4)
 
 # libVendorGraphicbuffer
-SOONG_CONFIG_NAMESPACES += vendorgraphicbuffer
-SOONG_CONFIG_vendorgraphicbuffer := \
-	gralloc_version
-
 ifeq ($(BOARD_USES_EXYNOS_GRALLOC_VERSION),4)
-SOONG_CONFIG_vendorgraphicbuffer_gralloc_version := four
+$(call soong_config_set,vendorgraphicbuffer,gralloc_version,four)
 else
-SOONG_CONFIG_vendorgraphicbuffer_gralloc_version := three
+$(call soong_config_set,vendorgraphicbuffer,gralloc_version,three)
 endif
 
 # Graphics
@@ -215,28 +203,16 @@ BOARD_SUPER_PARTITION_ERROR_LIMIT := 8006926336
 #
 BOARD_USES_GENERIC_AUDIO := true
 
-SOONG_CONFIG_NAMESPACES += aoc_audio_func
-
-SOONG_CONFIG_aoc_audio_func += \
-    ext_hidl
-
-SOONG_CONFIG_aoc_audio_func_ext_hidl := true
+$(call soong_config_set,aoc_audio_func,ext_hidl,true)
 
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-SOONG_CONFIG_aoc_audio_func += \
-    dump_usecase_data \
-    hal_socket_control \
-    record_tunning_keys
-
-SOONG_CONFIG_aoc_audio_func_dump_usecase_data := true
-SOONG_CONFIG_aoc_audio_func_hal_socket_control := true
-SOONG_CONFIG_aoc_audio_func_record_tunning_keys := true
+$(call soong_config_set,aoc_audio_func,dump_usecase_data,true)
+$(call soong_config_set,aoc_audio_func,hal_socket_control,true)
+$(call soong_config_set,aoc_audio_func,record_tunning_keys,true)
 endif
 
 ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
-SOONG_CONFIG_aoc_audio_func += aosp_build
-
-SOONG_CONFIG_aoc_audio_func_aosp_build := true
+$(call soong_config_set,aoc_audio_func,aosp_build,true)
 endif
 
 # Primary AudioHAL Configuration
diff --git a/device.mk b/device.mk
index 8ca8deb..4b1a946 100644
--- a/device.mk
+++ b/device.mk
@@ -485,32 +485,16 @@ else
 endif
 
 #ifneq ($(wildcard vendor/google/camera),)
-SOONG_CONFIG_NAMESPACES += lyric
-SOONG_CONFIG_lyric += \
-	use_lyric_camera_hal \
-	soc \
-	tuning_product
-
-SOONG_CONFIG_lyric_soc := gs201
-SOONG_CONFIG_lyric_use_lyric_camera_hal := true
-# SOONG_CONFIG_lyric_tuning_product is set in device-specific makefiles,
+$(call soong_config_set,lyric,soc,gs201)
+$(call soong_config_set,lyric,use_lyric_camera_hal,true)
+# lyric::tuning_product is set in device-specific makefiles,
 # such as device/google/${DEVICE}/device-${DEVICE}.mk
 
-SOONG_CONFIG_NAMESPACES += google3a_config
-SOONG_CONFIG_google3a_config += \
-	soc \
-	gcam_awb \
-	ghawb_truetone \
-	target_device
+$(call soong_config_set,google3a_config,soc,gs201)
+$(call soong_config_set,google3a_config,gcam_awb,true)
+$(call soong_config_set,google3a_config,ghawb_truetone,true)
 
-SOONG_CONFIG_google3a_config_soc := gs201
-SOONG_CONFIG_google3a_config_gcam_awb := true
-SOONG_CONFIG_google3a_config_ghawb_truetone := true
-
-
-SOONG_CONFIG_NAMESPACES += gch
-SOONG_CONFIG_gch += hwl_library
-SOONG_CONFIG_gch_hwl_library := lyric
+$(call soong_config_set,gch,hwl_library,lyric)
 #endif
 
 # WiFi
@@ -671,9 +655,7 @@ endif
 ## VIDEO
 ####################################
 
-SOONG_CONFIG_NAMESPACES += bigo
-SOONG_CONFIG_bigo += soc
-SOONG_CONFIG_bigo_soc := gs201
+$(call soong_config_set,bigo,soc,gs201)
 
 # 1. Codec 2.0
 # exynos service
@@ -964,11 +946,7 @@ PRODUCT_SOONG_NAMESPACES += \
 	vendor/google/whitechapel/audio/hal \
 	vendor/google/whitechapel/audio/interfaces
 
-SOONG_CONFIG_NAMESPACES += aoc_audio_board
-SOONG_CONFIG_aoc_audio_board += \
-	platform
-
-SOONG_CONFIG_aoc_audio_board_platform := $(TARGET_BOARD_PLATFORM)
+$(call soong_config_set,aoc_audio_board,platform,$(TARGET_BOARD_PLATFORM))
 #
 ## Audio properties
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/edgetpu/edgetpu.mk b/edgetpu/edgetpu.mk
index da17a4c..c97b5ab 100644
--- a/edgetpu/edgetpu.mk
+++ b/edgetpu/edgetpu.mk
@@ -1,10 +1,7 @@
 # Edgetpu packages
 
 # Config variables for TPU chip on device.
-SOONG_CONFIG_NAMESPACES += edgetpu_config
-SOONG_CONFIG_edgetpu_config += chip
-
-SOONG_CONFIG_edgetpu_config_chip := janeiro
+$(call soong_config_set,edgetpu_config,chip,janeiro)
 
 # TPU logging service
 PRODUCT_PACKAGES += \
diff --git a/fingerprint/udfps.mk b/fingerprint/udfps.mk
index dbd827a..61f138f 100644
--- a/fingerprint/udfps.mk
+++ b/fingerprint/udfps.mk
@@ -21,9 +21,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_SOONG_NAMESPACES += vendor/goodix/udfps/g6_trusty
 PRODUCT_SOONG_NAMESPACES += vendor/goodix/udfps/g6_aidl_trusty
 
-SOONG_CONFIG_NAMESPACES += fp_hal_feature
-SOONG_CONFIG_fp_hal_feature += biometric_suez_support
-SOONG_CONFIG_fp_hal_feature_biometric_suez_support := true
+$(call soong_config_set,fp_hal_feature,biometric_suez_support,true)
 
 PRODUCT_PACKAGES += \
     android.hardware.biometrics.fingerprint@2.1-service.goodix \