Fix builds where LyricCameraHAL is not present.

This file contained incorrect commented-out conditionals that
were apparently copied and pasted from somewhere. Fix them to
match gs101 configuration.

Bug: 212047904
Test: build master-without-vendor
Change-Id: Ibecd05d6e5cf1ee94be57203b63c6aec3cab8aa6
This commit is contained in:
Krzysztof Kosiński
2022-01-26 01:20:45 +00:00
parent 8bf22ece52
commit d185483165
2 changed files with 10 additions and 6 deletions

View File

@@ -371,3 +371,7 @@ BOARD_KERNEL_CMDLINE += at24.write_timeout=100
# Enable larger logbuf
BOARD_KERNEL_CMDLINE += log_buf_len=1024K
# Protected VM firmware
BOARD_PREBUILT_PVMFWIMAGE := packages/modules/Virtualization/pvmfw/pvmfw.img
BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000

View File

@@ -493,18 +493,18 @@ else
LOCAL_TARGET_PRODUCT := slider
endif
#ifneq ($(wildcard vendor/google/camera),)
$(call soong_config_set,google3a_config,soc,gs201)
$(call soong_config_set,google3a_config,gcam_awb,true)
$(call soong_config_set,google3a_config,ghawb_truetone,true)
ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),)
$(call soong_config_set,lyric,soc,gs201)
$(call soong_config_set,lyric,use_lyric_camera_hal,true)
# lyric::tuning_product is set in device-specific makefiles,
# such as device/google/${DEVICE}/device-${DEVICE}.mk
$(call soong_config_set,google3a_config,soc,gs201)
$(call soong_config_set,google3a_config,gcam_awb,true)
$(call soong_config_set,google3a_config,ghawb_truetone,true)
$(call soong_config_set,gch,hwl_library,lyric)
#endif
endif
# WiFi
PRODUCT_PACKAGES += \