From c66baf70f6294f9a87f96b6248e12609b8b999d6 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Tue, 29 Oct 2019 11:00:15 -0700 Subject: [PATCH] Add support for $(TARGET_EXPERIMENTAL_MTE) in product configs. We are bringing up support for ARM Memory Tagging Extension in the platform, but the required patches have not yet landed in the upstream kernel. This change adds support for a product variable that products may set to true to declare support for an experimental userspace interface to MTE. Setting the variable to true causes a product configuration to be enabled which will activate code in bionic and scudo that uses the interface. This variable should not be set to true in shipping products because the userspace interface has not been finalized and is subject to change. Once the support patches have landed in the kernel, bionic and scudo will be changed to use the official interface and the variable will be removed. Bug: 135772972 Change-Id: I8ba5dea4de374eb6775edb6d4e3c0cf9cad8d760 --- android/variable.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/android/variable.go b/android/variable.go index 41943b0f9..abbdf21bd 100644 --- a/android/variable.go +++ b/android/variable.go @@ -119,6 +119,10 @@ type variableProperties struct { Flatten_apex struct { Enabled *bool } + + Experimental_mte struct { + Cflags []string `android:"arch_variant"` + } `android:"arch_variant"` } `android:"arch_variant"` } @@ -228,6 +232,8 @@ type productVariables struct { EnableXOM *bool `json:",omitempty"` XOMExcludePaths []string `json:",omitempty"` + Experimental_mte *bool `json:",omitempty"` + VendorPath *string `json:",omitempty"` OdmPath *string `json:",omitempty"` ProductPath *string `json:",omitempty"`