From 9ca9d2d925637308f80d77ae9688c44ca5b9298e Mon Sep 17 00:00:00 2001
From: maade93791 <70593890+maade69@users.noreply.github.com>
Date: Mon, 9 Sep 2024 23:58:08 +0300
Subject: [PATCH] android: use more basic CPU target for memtag

This is required for hardened_malloc to work in microdroid on MTE-enabled devices (currently, 8th
and 9th generation Pixels) since PVMFW only supports ARMv8 cores.

https://android.googlesource.com/platform/packages/modules/Virtualization/+/refs/tags/android-15.0.0_r1/pvmfw/platform.dts#100
---
 Android.bp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.bp b/Android.bp
index 0db6a04..26ee403 100644
--- a/Android.bp
+++ b/Android.bp
@@ -74,7 +74,7 @@ cc_library {
             cflags: ["-DLABEL_MEMORY"],
         },
         device_has_arm_mte: {
-            cflags: ["-DHAS_ARM_MTE", "-march=armv9-a+memtag"]
+            cflags: ["-DHAS_ARM_MTE", "-march=armv8-a+dotprod+memtag"]
         },
     },
     apex_available: [