p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Use APK CtsShim prebuilts for flattened apex." into rvc-dev

This commit is contained in:
TreeHugger Robot 2020-06-09 11:14:45 +00:00 committed by Android (Google) Code Review
parent 76e974567c b586dba65a
commit 7a726856a9
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/product/base_system.mk
View File

@ -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 \

2
target/product/updatable_apex.mk
View File

@ -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