commit e279ae72260d121afd8295f99c53732884865e63
author Martin Stjernholm <mast@google.com> Mon Oct 31 11:52:10 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 31 11:52:10 2022 +0000
tree 043573eb613579b40ae2a670dee9099eabe45aae
parent 70bcc911693b9089345e610a3fec80f153c9854e
parent 8787ebe054af5944cd6662cbc92810719abe9046

Merge "Add allowlist patterns for dexpreopted files."

target/product/runtime_libart.mk

diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index 1ebd4ab..a62cda7 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -165,3 +165,13 @@
     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