From dc02c7176f592d00610ca5db3648f90194434c2d Mon Sep 17 00:00:00 2001
From: Mitch Phillips <mitchp@google.com>
Date: Tue, 18 Jul 2023 13:46:05 +0200
Subject: [PATCH] Refactor fullmte bits into common dir

Pull fullmte-common and fullmte-vars into a common dir so they can also
be used by other devices. See the topic changes for device/google/gs-common.

Bug: 288843255
Test: run soong for shiba_fullmte, build/flash husky_fullmte.

Change-Id: I6cc636596acff8b5234197fe26f85e27f7e85a62
---
 aosp_husky_fullmte.mk      | 3 +--
 aosp_ripcurrent_fullmte.mk | 3 +--
 aosp_shiba_fullmte.mk      | 3 +--
 fullmte-common.mk          | 2 --
 fullmte-vars.mk            | 4 ----
 5 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 100644 fullmte-common.mk
 delete mode 100644 fullmte-vars.mk

diff --git a/aosp_husky_fullmte.mk b/aosp_husky_fullmte.mk
index a8429e5..06a5db0 100644
--- a/aosp_husky_fullmte.mk
+++ b/aosp_husky_fullmte.mk
@@ -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/fullmte-common.mk)
 
 PRODUCT_NAME := aosp_husky_fullmte
diff --git a/aosp_ripcurrent_fullmte.mk b/aosp_ripcurrent_fullmte.mk
index 781137a..b7dc289 100644
--- a/aosp_ripcurrent_fullmte.mk
+++ b/aosp_ripcurrent_fullmte.mk
@@ -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/fullmte-common.mk)
 
 PRODUCT_NAME := aosp_ripcurrent_fullmte
diff --git a/aosp_shiba_fullmte.mk b/aosp_shiba_fullmte.mk
index 76333e0..8f31bd5 100644
--- a/aosp_shiba_fullmte.mk
+++ b/aosp_shiba_fullmte.mk
@@ -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/fullmte-common.mk)
 
 PRODUCT_NAME := aosp_shiba_fullmte
diff --git a/fullmte-common.mk b/fullmte-common.mk
deleted file mode 100644
index 1591a33..0000000
--- a/fullmte-common.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BOARD_KERNEL_CMDLINE += bootloader.pixel.MTE_FORCE_ON
-PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.default=sync
diff --git a/fullmte-vars.mk b/fullmte-vars.mk
deleted file mode 100644
index c8c87ff..0000000
--- a/fullmte-vars.mk
+++ /dev/null
@@ -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