Merge "Refactor fullmte bits into common dir" into udc-qpr-dev am: 69e30ce733

Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/24210035

Change-Id: Ie0596093ac0b28e4de650f6ae28bbbe6e41cf1ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mitch Phillips 2023-07-28 18:12:23 +00:00 committed by Automerger Merge Worker
commit 76afe8164b
5 changed files with 3 additions and 12 deletions

View file

@ -1,5 +1,4 @@
include device/google/shusky/fullmte-vars.mk include device/google/gs-common/mte/fullmte-pixel.mk
$(call inherit-product, device/google/shusky/aosp_husky.mk) $(call inherit-product, device/google/shusky/aosp_husky.mk)
$(call inherit-product, device/google/shusky/fullmte-common.mk)
PRODUCT_NAME := aosp_husky_fullmte PRODUCT_NAME := aosp_husky_fullmte

View file

@ -1,5 +1,4 @@
include device/google/shusky/fullmte-vars.mk include device/google/gs-common/mte/fullmte-pixel.mk
$(call inherit-product, device/google/shusky/aosp_ripcurrent.mk) $(call inherit-product, device/google/shusky/aosp_ripcurrent.mk)
$(call inherit-product, device/google/shusky/fullmte-common.mk)
PRODUCT_NAME := aosp_ripcurrent_fullmte PRODUCT_NAME := aosp_ripcurrent_fullmte

View file

@ -1,5 +1,4 @@
include device/google/shusky/fullmte-vars.mk include device/google/gs-common/mte/fullmte-pixel.mk
$(call inherit-product, device/google/shusky/aosp_shiba.mk) $(call inherit-product, device/google/shusky/aosp_shiba.mk)
$(call inherit-product, device/google/shusky/fullmte-common.mk)
PRODUCT_NAME := aosp_shiba_fullmte PRODUCT_NAME := aosp_shiba_fullmte

View file

@ -1,2 +0,0 @@
BOARD_KERNEL_CMDLINE += bootloader.pixel.MTE_FORCE_ON
PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.default=sync

View file

@ -1,4 +0,0 @@
ifeq ($(filter memtag_heap,$(SANITIZE_TARGET)),)
SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) memtag_heap memtag_stack)
SANITIZE_TARGET_DIAG := $(strip $(SANITIZE_TARGET_DIAG) memtag_heap)
endif