Snap for 12229688 from 722dbe869c to 24Q4-release

Change-Id: Ib02018a0dda57c28c143244d6dee6dc9554dc826
This commit is contained in:
Android Build Coastguard Worker 2024-08-14 23:02:08 +00:00
commit b4d0a2002a
2 changed files with 10 additions and 6 deletions

View file

@ -14,8 +14,13 @@ ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),)
$(call soong_config_set,gch,hwl_library,lyric)
endif
# Check if we're in the internal build
ifneq ($(wildcard vendor/google/camera),)
# Use build-time flag to select whether to build from source
# or ingest prebuilt-apex. We would want the development teams
# using release configuration: (trunk-staging) to build from source.
# All shipping releases will switch to prebuilts (trunk+)
# if this condition is not true, then build from source.
ifneq ($(RELEASE_PIXEL_CAMERA_ENABLE_PREBUILT),true)
PRODUCT_SOONG_NAMESPACES += \
vendor/google/camera \
@ -36,8 +41,7 @@ PRODUCT_SOONG_NAMESPACES += \
# Calibration tool for debug builds
PRODUCT_PACKAGES_DEBUG += tarasque_test
PRODUCT_PACKAGES_DEBUG += ProtoCalibGenerator
endif # vendor/google/camera check
endif # RELEASE_PIXEL_CAMERA_ENABLE_PREBUILT check
# Init-time log settings for Google 3A
PRODUCT_PACKAGES += libg3a_standalone_gabc_rc

View file

@ -8,9 +8,9 @@ PRODUCT_PACKAGES += pixel_gralloc_allocator
PRODUCT_PACKAGES += pixel_gralloc_mapper
ifeq ($(USE_MAPPER5), true)
$(call soong_config_set,arm_gralloc,mapper_version,mapper5)
$(call soong_config_set,pixel_gralloc,mapper_version,mapper5)
$(call soong_config_set,aion_buffer,mapper_version,mapper5)
else
$(call soong_config_set,arm_gralloc,mapper_version,mapper4)
$(call soong_config_set,pixel_gralloc,mapper_version,mapper4)
$(call soong_config_set,aion_buffer,mapper_version,mapper4)
endif