Use soong_config_ macros to set Soong config variables. am: 454cb66a74
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/1932105 Change-Id: Ie9f1878088786ac649d39a327062be470bd2a609
This commit is contained in:
Sasha Smundak
Automerger Merge Worker
commit
db090bdc82
4 changed files with 26 additions and 71 deletions
|
|
@ -110,29 +110,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
|
||||
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))
|
||||
|
||||
# Graphics
|
||||
#BOARD_USES_EXYNOS_DATASPACE_FEATURE := true
|
||||
|
|
@ -196,28 +187,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
|
||||
|
|
|
|||
35
device.mk
35
device.mk
|
|
@ -489,18 +489,10 @@ else
|
|||
LOCAL_TARGET_PRODUCT := slider
|
||||
endif
|
||||
|
||||
|
||||
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
|
||||
SOONG_CONFIG_google3a_config_ghawb_truetone := true
|
||||
SOONG_CONFIG_google3a_config_target_device := $(LOCAL_TARGET_PRODUCT)
|
||||
$(call soong_config_set,google3a_config,soc,gs101)
|
||||
$(call soong_config_set,google3a_config,gcam_awb,true)
|
||||
$(call soong_config_set,google3a_config,ghawb_truetone,true)
|
||||
$(call soong_config_set,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,14 +504,9 @@ SOONG_CONFIG_google3a_config_target_device := $(LOCAL_TARGET_PRODUCT)
|
|||
# - PDK gs101 builds because they still have vendor/google/services/LyricCameraHAL/src
|
||||
|
||||
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 := true
|
||||
|
||||
$(call soong_config_set,lyric,use_lyric_camera_hal,true)
|
||||
# Camera HAL library selection
|
||||
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
|
||||
|
|
@ -695,9 +682,7 @@ endif
|
|||
## VIDEO
|
||||
####################################
|
||||
|
||||
SOONG_CONFIG_NAMESPACES += bigo
|
||||
SOONG_CONFIG_bigo += soc
|
||||
SOONG_CONFIG_bigo_soc := gs101
|
||||
$(call soong_config_set,bigo,soc,gs101)
|
||||
|
||||
# MFC firmware
|
||||
PRODUCT_COPY_FILES += \
|
||||
|
|
@ -1008,11 +993,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 += \
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
# Config variables for TPU chip on device.
|
||||
SOONG_CONFIG_NAMESPACES += edgetpu_config
|
||||
SOONG_CONFIG_edgetpu_config += chip
|
||||
|
||||
SOONG_CONFIG_edgetpu_config_chip := abrolhos
|
||||
$(call soong_config_set,edgetpu_config,chip,abrolhos)
|
||||
|
||||
# TPU logging service
|
||||
PRODUCT_PACKAGES += \
|
||||
|
|
|
|||
|
|
@ -27,6 +27,4 @@ endif
|
|||
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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue