commit 7858101d4b954fa2029c6e9d2ef2a04654031e3f
author Ulyana Trafimovich <skvadrik@google.com> Wed Nov 24 15:50:04 2021 +0000
committer Alan Stokes <alanstokes@google.com> Thu Nov 25 09:00:03 2021 +0000
tree 7cb9ad611529806c851e79021615b1604a6d77cf
parent 5ebfd8461d001a5b1d2b24688f9ef9ac5dd32818

Revert "Disable CompOS system server classpath fragment"

This reverts commit e85dfde30dbf958b6b09cbf119a71b304e71abf6.

Reason for revert: relanding after fix https://r.android.com/1900565

Bug: 207474880
Change-Id: I6957329a582b4dade85dbe29d5840c903e7b0914
Test: atest art_standalone_dexpreopt_tests

apex/product_packages.mk

diff --git a/apex/product_packages.mk b/apex/product_packages.mk
index 02d7989..1a431d5 100644
--- a/apex/product_packages.mk
+++ b/apex/product_packages.mk
@@ -29,6 +29,6 @@
     system/framework/oat/%@service-compos.jar@classes.odex \
     system/framework/oat/%@service-compos.jar@classes.vdex \
 
-# PRODUCT_APEX_SYSTEM_SERVER_JARS := com.android.compos:service-compos
+PRODUCT_APEX_SYSTEM_SERVER_JARS := com.android.compos:service-compos
 
-# PRODUCT_SYSTEM_EXT_PROPERTIES := ro.config.isolated_compilation_enabled=true
+PRODUCT_SYSTEM_EXT_PROPERTIES := ro.config.isolated_compilation_enabled=true