From 304bb210a204bde62e33ae5a1379bacceb5e3ac4 Mon Sep 17 00:00:00 2001 From: Mitch Phillips Date: Fri, 20 Aug 2021 10:19:25 -0700 Subject: [PATCH] RESTRICT AUTOMERGE: [MTE] Update manifest IDs to align with NDK. The NDK is built out of internal *-release branches. Unfortunately, the internal and external manifest attribute IDs don't currently line up. As a result, NDK-built apps with memtagMode='[a]sync' won't turn on MTE on AOSP images, but work in internal images. We'd like NDK-built apps to work out of the box with AOSP images, and so let's line up these IDs to fix the silent failure. This is especially important as testing is mostly done using AOSP-on-QEMU. RESTRICT AUTOMERGE because this should be an AOSP-only patch. Bug: N/A Test: Build the sanitizer test app (https://github.com/google/sanitizers/tree/master/android) with an MTE attribute and make sure you crash with MTE errors. Change-Id: I48a3e08d01508dc6694fefd9563fb7d3f25108a9 --- core/api/current.txt | 4 ++-- core/res/res/values/public.xml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index 5de5f83b90397..02e90b6069aa5 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -954,7 +954,7 @@ package android { field public static final int measureWithLargestChild = 16843476; // 0x10102d4 field public static final int mediaRouteButtonStyle = 16843693; // 0x10103ad field public static final int mediaRouteTypes = 16843694; // 0x10103ae - field public static final int memtagMode = 16844313; // 0x1010619 + field public static final int memtagMode = 16844324; // 0x1010624 field public static final int menuCategory = 16843230; // 0x10101de field public static final int mimeGroup = 16844309; // 0x1010615 field public static final int mimeType = 16842790; // 0x1010026 @@ -978,7 +978,7 @@ package android { field public static final int multiArch = 16843918; // 0x101048e field public static final int multiprocess = 16842771; // 0x1010013 field public static final int name = 16842755; // 0x1010003 - field public static final int nativeHeapZeroInitialized = 16844314; // 0x101061a + field public static final int nativeHeapZeroInitialized = 16844325; // 0x1010625 field public static final int navigationBarColor = 16843858; // 0x1010452 field public static final int navigationBarDividerColor = 16844141; // 0x101056d field public static final int navigationContentDescription = 16843969; // 0x10104c1 diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 6a4702be35c95..c1c185823d339 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3046,6 +3046,9 @@ + + +