Merge cherrypicks of [16633077] into tm-release.

Change-Id: If4f57c27972002af8fa5c86a92944198d5802bb1
This commit is contained in:
Android Build Coastguard Worker 2022-01-13 23:23:39 +00:00
commit 9f25c18071

View file

@ -564,7 +564,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/compression.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk)
# Titan-M # Titan-M
ifneq (,$(BOARD_HAS_DTLS)) ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
include hardware/google/pixel/dauntless/dauntless.mk include hardware/google/pixel/dauntless/dauntless.mk
endif endif