commit b016c20911a100d868a846895c2380f168e94c93
author Spandan Das <spandandas@google.com> Tue Oct 08 02:15:54 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 08 02:15:54 2024 +0000
tree 63e83089095a19a801c755e03a2962ae96ed64b6
parent 36dcb11aea65a0d0203cad7f4f5c9e79a638c8ec
parent 3e9b0a8825e19820836bd45d4a6e0b7157f88bba

Remove dexpreopt files of service-compos from /system's artifact list am: 0c69740c3a am: 3e9b0a8825

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3297137

Change-Id: Iff16e0b701c35d8fa26acad11e07c64adbbccec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

build/apex/product_packages.mk

diff --git a/build/apex/product_packages.mk b/build/apex/product_packages.mk
index b2a4ca2..c678693 100644
--- a/build/apex/product_packages.mk
+++ b/build/apex/product_packages.mk
@@ -26,11 +26,13 @@
     com.android.compos \
     features_com.android.virt.xml
 
-# TODO(b/207336449): Figure out how to get these off /system
+ifneq (true, $(RELEASE_INSTALL_APEX_SYSTEMSERVER_DEXPREOPT_SAME_PARTITION))
 PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST := \
     system/framework/oat/%@service-compos.jar@classes.odex \
     system/framework/oat/%@service-compos.jar@classes.vdex \
 
+endif
+
 PRODUCT_APEX_SYSTEM_SERVER_JARS := com.android.compos:service-compos
 
 PRODUCT_SYSTEM_EXT_PROPERTIES := ro.config.isolated_compilation_enabled=true