StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use APK CtsShim prebuilts for flattened apex.

Browse Source 
Fix: 158036322
Test: built flame-userdebug with m OVERRIDE_TARGET_FLATTEN_APEX=true, ran
atest CtsAppSecurityHostTestCases:android.appsecurity.cts.PrivilegedUpdateTests#testDisableUpdatedSystemApp
and verified that the cts shim apex is not installed

Change-Id: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
Merged-In: Icc52500cfc0a555e11d1a467b2da0649c7f5d31f
(cherry picked from commit c9a786e5f77a5c06da6c07f718e4a7619a75d9e6)
This commit is contained in:
Dario Freni
2020-06-04 09:42:42 +00:00
parent a973323a9d
commit b586dba65a
2 changed files with 4 additions and 1 deletions
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 \ charger \
cmd \ cmd \
com.android.adbd \ com.android.adbd \
com.android.apex.cts.shim.v1 \
com.android.conscrypt \ com.android.conscrypt \
com.android.extservices \ com.android.extservices \
com.android.i18n \ com.android.i18n \
@@ -71,6 +70,8 @@ PRODUCT_PACKAGES += \
ContactsProvider \ ContactsProvider \
content \ content \
crash_dump \ crash_dump \
CtsShimPrebuilt \
CtsShimPrivPrebuilt \
debuggerd\ debuggerd\
device_config \ device_config \
dmctl \ dmctl \

2
target/product/updatable_apex.mk
View File

@@ -17,6 +17,8 @@
# 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)
# 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_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