Remove dexpreopt files of service-compos from /system's artifact list
These files will be installed in /system_ext. This behavior is guarded
by RELEASE_INSTALL_APEX_SYSTEMSERVER_DEXPREOPT_SAME_PARTITION.
Test: lunch gsi_x86_64-trunk_staging-userdebug && m nothing
Bug: 371880017
Bug: 207336449
Change-Id: I29dea0767755615303858946c5f34691628d9729
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