openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Move CtsShim and CtsPrivShim APKs out of system." am: 20d1b7d966 am: 6b0308921b 

Change-Id: If7799ae7bd9e6613b3ff5eb06801b7c31b17ff97
This commit is contained in:
Automerger Merge Worker 2019-12-17 20:19:49 +00:00
parent a219cab736 6b0308921b
commit 3b9b4ffc95
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 "" # 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) $(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 # 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 \ charger \
cmd \ cmd \
com.android.adbd \ com.android.adbd \
com.android.apex.cts.shim.v1_prebuilt \ com.android.apex.cts.shim.v1 \
com.android.conscrypt \ com.android.conscrypt \
com.android.cronet \ com.android.cronet \
com.android.i18n \ com.android.i18n \
@ -64,8 +64,6 @@ PRODUCT_PACKAGES += \
ContactsProvider \ ContactsProvider \
content \ content \
crash_dump \ crash_dump \
CtsShimPrebuilt \
CtsShimPrivPrebuilt \
debuggerd\ debuggerd\
device_config \ device_config \
dmctl \ dmctl \

1
target/product/updatable_apex.mk
View File

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