diff options
| -rw-r--r-- | target/product/base_system.mk | 3 | ||||
| -rw-r--r-- | target/product/updatable_apex.mk | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/target/product/base_system.mk b/target/product/base_system.mk index c074807043..1742bce092 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -51,7 +51,6 @@ PRODUCT_PACKAGES += \ charger \ cmd \ com.android.adbd \ - com.android.apex.cts.shim.v1 \ com.android.conscrypt \ com.android.extservices \ com.android.i18n \ @@ -71,6 +70,8 @@ PRODUCT_PACKAGES += \ ContactsProvider \ content \ crash_dump \ + CtsShimPrebuilt \ + CtsShimPrivPrebuilt \ debuggerd\ device_config \ dmctl \ diff --git a/target/product/updatable_apex.mk b/target/product/updatable_apex.mk index e5a647c20c..a84a0d2ba3 100644 --- a/target/product/updatable_apex.mk +++ b/target/product/updatable_apex.mk @@ -17,6 +17,8 @@ # Inherit this when the target needs to support updating APEXes ifneq ($(OVERRIDE_TARGET_FLATTEN_APEX),true) + # com.android.apex.cts.shim.v1_prebuilt overrides CtsShimPrebuilt + # and CtsShimPrivPrebuilt since they are packaged inside the APEX. PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_prebuilt PRODUCT_PROPERTY_OVERRIDES := ro.apex.updatable=true TARGET_FLATTEN_APEX := false |