Use soong_config_ macros to set Soong config variables.

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

BoardConfig-common.mk

@@ -116,29 +116,20 @@ BOARD_USES_GRALLOC_ION_SYNC := true
 BOARD_USES_SWIFTSHADER := false
 
 # Gralloc4
-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
+$(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,true)
-SOONG_CONFIG_arm_gralloc_mali_gpu_support_afbc_basic := false
+$(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_basic,false)
-SOONG_CONFIG_arm_gralloc_mali_gpu_support_afbc_wideblk := false
+$(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_wideblk,false)
-SOONG_CONFIG_arm_gralloc_gralloc_init_afbc := false
+$(call soong_config_set,arm_gralloc,gralloc_init_afbc,false)
-SOONG_CONFIG_arm_gralloc_dpu_support_1010102_afbc := false
+$(call soong_config_set,arm_gralloc,dpu_support_1010102_afbc,false)
 else
-SOONG_CONFIG_arm_gralloc_gralloc_arm_no_external_afbc := false
+$(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,false)
-SOONG_CONFIG_arm_gralloc_mali_gpu_support_afbc_basic := true
+$(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_basic,true)
-SOONG_CONFIG_arm_gralloc_mali_gpu_support_afbc_wideblk := true
+$(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_wideblk,true)
-SOONG_CONFIG_arm_gralloc_gralloc_init_afbc := true
+$(call soong_config_set,arm_gralloc,gralloc_init_afbc,true)
-SOONG_CONFIG_arm_gralloc_dpu_support_1010102_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))
 
 # Graphics
 #BOARD_USES_EXYNOS_DATASPACE_FEATURE := true
@@ -202,34 +193,19 @@ BOARD_SUPER_PARTITION_ERROR_LIMIT := 8006926336
 #
 BOARD_USES_GENERIC_AUDIO := true
 
-SOONG_CONFIG_NAMESPACES += aoc_audio_func
+$(call soong_config_set,aoc_audio_func,ext_hidl,true)
-
-SOONG_CONFIG_aoc_audio_func += \
-    ext_hidl
-
-SOONG_CONFIG_aoc_audio_func_ext_hidl := true
 
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-SOONG_CONFIG_aoc_audio_func += \
+$(call soong_config_set,aoc_audio_func,dump_usecase_data,true)
-    dump_usecase_data \
+$(call soong_config_set,aoc_audio_func,hal_socket_control,true)
-    hal_socket_control \
+$(call soong_config_set,aoc_audio_func,record_tunning_keys,true)
-    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
 endif
 
 ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
-SOONG_CONFIG_aoc_audio_func += aosp_build
+$(call soong_config_set,aoc_audio_func,aosp_build,true)
-
-SOONG_CONFIG_aoc_audio_func_aosp_build := true
 endif
 
-SOONG_CONFIG_NAMESPACES += haptics
+$(call soong_config_set,haptics,actuator_model,$(ACTUATOR_MODEL))
-SOONG_CONFIG_haptics += \
-    actuator_model
-SOONG_CONFIG_haptics_actuator_model := $(ACTUATOR_MODEL)
 
 # Primary AudioHAL Configuration
 #BOARD_USE_COMMON_AUDIOHAL := true
@@ -359,7 +335,7 @@ WIFI_FEATURE_HOSTAPD_11AX := true
 # NeuralNetworks
 GPU_SOURCE_PRESENT := $(wildcard vendor/arm/mali/valhall)
 GPU_PREBUILD_PRESENT := $(wildcard vendor/google_devices/gs101/prebuilts/gpu/libs)
-ifneq "$(or $(GPU_SOURCE_PRESENT),$(GPU_PREBUILD_PRESENT))" ""
+ifneq (,$(strip $(GPU_SOURCE_PRESENT) $(GPU_PREBUILD_PRESENT)))
 ARMNN_COMPUTE_CL_ENABLE := 1
 else
 ARMNN_COMPUTE_CL_ENABLE := 0

device.mk

@@ -475,16 +475,11 @@ PRODUCT_PACKAGES += \
 	android.hardware.drm@1.4-service.widevine \
 	liboemcrypto \
 
-SOONG_CONFIG_NAMESPACES += google3a_config
-SOONG_CONFIG_google3a_config += \
-	soc \
-	gcam_awb \
-	ghawb_truetone \
-	target_device
 
-SOONG_CONFIG_google3a_config_soc := gs101
+
-SOONG_CONFIG_google3a_config_gcam_awb := true
+$(call soong_config_set,google3a_config,soc,gs101)
-SOONG_CONFIG_google3a_config_ghawb_truetone := true
+$(call soong_config_set,google3a_config,gcam_awb,true)
+$(call soong_config_set,google3a_config,ghawb_truetone,true)
 
 # 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:
@@ -496,20 +491,13 @@ SOONG_CONFIG_google3a_config_ghawb_truetone := true
 #    - PDK gs101 builds because they still have vendor/google/services/LyricCameraHAL/src
 
 ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),)
-SOONG_CONFIG_NAMESPACES += lyric
+$(call soong_config_set,lyric,soc,gs101)
-SOONG_CONFIG_lyric += \
+$(call soong_config_set,lyric,use_lyric_camera_hal,true)
-	use_lyric_camera_hal \
+# lyric::tuning_product is set in device-specific makefiles,
-	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
+$(call soong_config_set,gch,hwl_library,lyric)
-SOONG_CONFIG_gch += hwl_library
-SOONG_CONFIG_gch_hwl_library := lyric
 endif
 
 # WiFi
@@ -685,9 +673,7 @@ endif
 ## VIDEO
 ####################################
 
-SOONG_CONFIG_NAMESPACES += bigo
+$(call soong_config_set,bigo,soc,gs101)
-SOONG_CONFIG_bigo += soc
-SOONG_CONFIG_bigo_soc := gs101
 
 # MFC firmware
 PRODUCT_COPY_FILES += \
@@ -978,11 +964,7 @@ PRODUCT_SOONG_NAMESPACES += \
 	vendor/google/whitechapel/audio/hal \
 	vendor/google/whitechapel/audio/interfaces
 
-SOONG_CONFIG_NAMESPACES += aoc_audio_board
+$(call soong_config_set,aoc_audio_board,platform,$(TARGET_BOARD_PLATFORM))
-SOONG_CONFIG_aoc_audio_board += \
-	platform
-
-SOONG_CONFIG_aoc_audio_board_platform := $(TARGET_BOARD_PLATFORM)
 
 # Audio properties
 PRODUCT_PROPERTY_OVERRIDES += \

edgetpu/edgetpu.mk

@@ -1,8 +1,5 @@
 # Config variables for TPU chip on device.
-SOONG_CONFIG_NAMESPACES += edgetpu_config
+$(call soong_config_set,edgetpu_config,chip,abrolhos)
-SOONG_CONFIG_edgetpu_config += chip
-
-SOONG_CONFIG_edgetpu_config_chip := abrolhos
 
 # TPU logging service
 PRODUCT_PACKAGES += \

fingerprint/fpc1540/sw35/fingerprint_aidl_config.mk

@@ -20,6 +20,4 @@ FPC_CONFIG_GOOGLE_CUSTOMIZE=1
 GOOGLE_CONFIG_PERFORMANCE=1
 
 # Enable Suez
-SOONG_CONFIG_NAMESPACES += fp_hal_feature
+$(call soong_config_set,fp_hal_feature,biometric_suez_support,true)
-SOONG_CONFIG_fp_hal_feature += biometric_suez_support
-SOONG_CONFIG_fp_hal_feature_biometric_suez_support := true

fingerprint/udfps_common.mk

@@ -34,6 +34,4 @@ else
 $(error Invalid udfps build version)
 endif
 
-SOONG_CONFIG_NAMESPACES += fp_hal_feature
+$(call soong_config_set,fp_hal_feature,biometric_suez_support,true)
-SOONG_CONFIG_fp_hal_feature += biometric_suez_support
-SOONG_CONFIG_fp_hal_feature_biometric_suez_support := true