From 8787ebe054af5944cd6662cbc92810719abe9046 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@google.com>
Date: Thu, 6 Oct 2022 19:40:27 +0100
Subject: [PATCH] Add allowlist patterns for dexpreopted files.

Similar patterns have ended up in other places to work with the
prebuilt ART module, but they belong in ART.

#codehealth

Test: vendor/google/modules/ArtGoogle/build-with-prebuilt-art-module.sh droid
  on internal with prebuilts from mainline_modules on git_master-art
Bug: 238426831
Change-Id: Ice7aaef6a4e8dd04723ec2d7b009eb7e6f35f5d6
---
 target/product/runtime_libart.mk | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index 1ebd4ab6ef..a62cda7898 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -165,3 +165,13 @@ PRODUCT_SYSTEM_PROPERTIES += \
     dalvik.vm.usap_pool_size_max?=3 \
     dalvik.vm.usap_pool_size_min?=1 \
     dalvik.vm.usap_pool_refill_delay_ms?=3000
+
+# Allow dexopt files that are side-effects of already allowlisted files.
+# This is only necessary when ART is prebuilt.
+ifeq (false,$(ART_MODULE_BUILD_FROM_SOURCE))
+  PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
+      system/framework/%.art \
+      system/framework/%.oat \
+      system/framework/%.odex \
+      system/framework/%.vdex
+endif