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

Move CtsShim and CtsPrivShim APKs out of system. 

These packages are now available in the shim apex package, which is made
available in both flattened and unflattened apex configurations.

Bug: 138429615
Test: atest CtsPrivilegedUpdateTests CtsPermissionTestCases
CtsStagedInstallHostTestCases; (on both flattened and unflattened
configurations)
Merged-In: I03939f6c3e711d5887da201e32173f86a6b0289e
Change-Id: I03939f6c3e711d5887da201e32173f86a6b0289e
This commit is contained in:
Dario Freni 2019-12-02 20:46:03 +00:00
parent 4d5458d1f0
commit d5ed6019c9
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CleanSpec.mk
View File

@ -702,6 +702,13 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*.jar)
# The core image variant has been renamed to ""
$(call add-clean-step, find $(SOONG_OUT_DIR)/.intermediates -type d -name "android_*_core*" -print0 | xargs -0 rm -rf)
# Remove CtsShim apks from system partition, since the have been moved inside
# the cts shim apex. Also remove the cts shim apex prebuilt since it has been
# removed in flattened apexs configurations.
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/CtsShimPrivPrebuilt)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/CtsShimPrebuilt)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex/com.android.apex.cts.shim.apex)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************

4
target/product/base_system.mk
View File

@ -48,7 +48,7 @@ PRODUCT_PACKAGES += \
charger \
cmd \
com.android.adbd \
com.android.apex.cts.shim.v1_prebuilt \
com.android.apex.cts.shim.v1 \
com.android.conscrypt \
com.android.cronet \
com.android.i18n \
@ -64,8 +64,6 @@ PRODUCT_PACKAGES += \
ContactsProvider \
content \
crash_dump \
CtsShimPrebuilt \
CtsShimPrivPrebuilt \
debuggerd\
device_config \
dmctl \

1
target/product/updatable_apex.mk
View File

@ -17,6 +17,7 @@
# Inherit this when the target needs to support updating APEXes
ifneq ($(OVERRIDE_TARGET_FLATTEN_APEX),true)
PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_prebuilt
PRODUCT_PROPERTY_OVERRIDES := ro.apex.updatable=true
TARGET_FLATTEN_APEX := false
endif