commit 8429734091f47596b65c3d8f0a665e76f9b8bcad
author Jiyong Park <jiyong@google.com> Thu Nov 25 14:24:08 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 25 14:24:08 2021 +0000
tree 7514f768416a13168223a6e641d42b26fbd9f4e7
parent 7858101d4b954fa2029c6e9d2ef2a04654031e3f
parent 1908108ac2c4763cf1032bb9aca4b841af9e22f8

Merge "Don't install files for the virt APEX onto the system partition"

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index b07dc3b..87d8e39 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -11,6 +11,9 @@
     },
     {
       "name": "MicrodroidTestApp"
+    },
+    {
+      "name": "art_standalone_dexpreopt_tests"
     }
   ],
   "imports": [

apex/product_packages.mk

diff --git a/apex/product_packages.mk b/apex/product_packages.mk
index 0e58d71..322b73e 100644
--- a/apex/product_packages.mk
+++ b/apex/product_packages.mk
@@ -28,6 +28,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