Update GCH configuration for gs101.

Bug: 188327280
Test: camera preview on oriole
Change-Id: Id7b9b1c6129a45edd0c65ed37531c4f34555a6e0
This commit is contained in:
Krzysztof Kosiński 2021-05-16 22:23:46 -07:00 committed by Yuriy Romanenko
parent 387995b245
commit 06861b99cc

View file

@ -492,9 +492,6 @@ else
LOCAL_TARGET_PRODUCT := slider LOCAL_TARGET_PRODUCT := slider
endif endif
SOONG_CONFIG_NAMESPACES += lyric
SOONG_CONFIG_lyric += use_lyric_camera_hal
SOONG_CONFIG_lyric_use_lyric_camera_hal := true
SOONG_CONFIG_NAMESPACES += google3a_config SOONG_CONFIG_NAMESPACES += google3a_config
SOONG_CONFIG_google3a_config += \ SOONG_CONFIG_google3a_config += \
@ -508,11 +505,25 @@ SOONG_CONFIG_google3a_config_gcam_awb := true
SOONG_CONFIG_google3a_config_ghawb_truetone := true SOONG_CONFIG_google3a_config_ghawb_truetone := true
SOONG_CONFIG_google3a_config_target_device := $(LOCAL_TARGET_PRODUCT) SOONG_CONFIG_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:
# - Non-pixel gs101 devices that exclude vendor/google/services/LyricCameraHAL/src (none as of now)
# - master-without-vendor and other types of AOSP builds (those won't built GCH either, but need this to actually start building)
#
# Builds that will have it are
# - Regular gs101 builds
# - 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
# Camera HAL library selection
SOONG_CONFIG_NAMESPACES += gch SOONG_CONFIG_NAMESPACES += gch
SOONG_CONFIG_gch += feature SOONG_CONFIG_gch += hwl_library
# Disable Legacy common hal modules for whi SOONG_CONFIG_gch_hwl_library := lyric
SOONG_CONFIG_gch_feature := use_lyric_hal endif
# WiFi # WiFi
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \