Merge cherrypicks of [16633077] into tm-release.

Change-Id: I10d03ef58d008aadc531397d978ef893dd09f460
This commit is contained in:
Android Build Coastguard Worker 2022-01-14 02:43:24 +00:00
commit 6c9b3a615f

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)
# Titan-M
ifneq (,$(BOARD_HAS_DTLS))
ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS)))
include hardware/google/pixel/dauntless/dauntless.mk
endif