Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use soong_config_ macros to set Soong config variables. am: 454cb66a74 am: db090bdc82

Browse source 
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/1932105

Change-Id: I3d06f2ab16c451cfff5dbbc14283e9da7cdbce7f
This commit is contained in:
Sasha Smundak 2022-01-21 22:29:51 +00:00 • committed by Automerger Merge Worker
commit 968f0e8f10
4 changed files with 26 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

53
BoardConfig-common.mk
View file

@ -120,29 +120,20 @@ BOARD_USES_GRALLOC_ION_SYNC := true
BOARD_USES_SWIFTSHADER := false BOARD_USES_SWIFTSHADER := false
# Gralloc4 # 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) 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 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) 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 # Graphics
#BOARD_USES_EXYNOS_DATASPACE_FEATURE := true #BOARD_USES_EXYNOS_DATASPACE_FEATURE := true
@ -206,28 +197,16 @@ BOARD_SUPER_PARTITION_ERROR_LIMIT := 8006926336
# #
BOARD_USES_GENERIC_AUDIO := true 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))) 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 endif
ifneq (,$(filter aosp_%,$(TARGET_PRODUCT))) 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 endif
# Primary AudioHAL Configuration # Primary AudioHAL Configuration

35
device.mk
View file

@ -488,18 +488,10 @@ else
LOCAL_TARGET_PRODUCT := slider LOCAL_TARGET_PRODUCT := slider
endif endif
$(call soong_config_set,google3a_config,soc,gs101)
SOONG_CONFIG_NAMESPACES += google3a_config $(call soong_config_set,google3a_config,gcam_awb,true)
SOONG_CONFIG_google3a_config += \ $(call soong_config_set,google3a_config,ghawb_truetone,true)
soc \ $(call soong_config_set,google3a_config,target_device,$(LOCAL_TARGET_PRODUCT))
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)
# Determine if Lyric is in the tree, and only have GCH build against it # 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: # if it is. Cases when Lyric isn't going to be in the tree:
@ -511,14 +503,9 @@ SOONG_CONFIG_google3a_config_target_device := $(LOCAL_TARGET_PRODUCT)
# - PDK gs101 builds because they still have vendor/google/services/LyricCameraHAL/src # - PDK gs101 builds because they still have vendor/google/services/LyricCameraHAL/src
ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),) ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),)
SOONG_CONFIG_NAMESPACES += lyric $(call soong_config_set,lyric,use_lyric_camera_hal,true)
SOONG_CONFIG_lyric += use_lyric_camera_hal
SOONG_CONFIG_lyric_use_lyric_camera_hal := true
# Camera HAL library selection # 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 endif
# WiFi # WiFi
@ -694,9 +681,7 @@ endif
## VIDEO ## VIDEO
#################################### ####################################
SOONG_CONFIG_NAMESPACES += bigo $(call soong_config_set,bigo,soc,gs101)
SOONG_CONFIG_bigo += soc
SOONG_CONFIG_bigo_soc := gs101
# MFC firmware # MFC firmware
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
@ -1007,11 +992,7 @@ PRODUCT_SOONG_NAMESPACES += \
vendor/google/whitechapel/audio/hal \ vendor/google/whitechapel/audio/hal \
vendor/google/whitechapel/audio/interfaces 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 # Audio properties
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \

5
edgetpu/edgetpu.mk
View file

@ -1,8 +1,5 @@
# Config variables for TPU chip on device. # 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 # TPU logging service
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \

4
fingerprint/udfps_common.mk
View file

@ -27,6 +27,4 @@ endif
PRODUCT_SOONG_NAMESPACES += vendor/goodix/udfps/g6_trusty PRODUCT_SOONG_NAMESPACES += vendor/goodix/udfps/g6_trusty
PRODUCT_SOONG_NAMESPACES += vendor/goodix/udfps/g6_aidl_trusty PRODUCT_SOONG_NAMESPACES += vendor/goodix/udfps/g6_aidl_trusty
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