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

Merge "Keystore 2.0: Remove keystore and keystore2.enable property." am: bacb3ebb2a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1626719

Change-Id: I7f51bd6aaf1e0fa8868a3c6b53e415b18fda589a
This commit is contained in:
Janis Danisevskis
2021-04-07 19:44:57 +00:00
committed by Automerger Merge Worker
parent 185080ab39 bacb3ebb2a
commit fd04a29fe0
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
target/product/base_system.mk
View File

@@ -116,7 +116,6 @@ PRODUCT_PACKAGES += \
iptables \ iptables \
ip-up-vpn \ ip-up-vpn \
javax.obex \ javax.obex \
keystore \
keystore2 \ keystore2 \
credstore \ credstore \
ld.mc \ ld.mc \
@@ -396,8 +395,4 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\
frameworks/base/config/dirty-image-objects:system/etc/dirty-image-objects) frameworks/base/config/dirty-image-objects:system/etc/dirty-image-objects)
# This property allows enabling Keystore 2.0 selectively for testing.
# TODO Remove when Keystore 2.0 migration is complete. b/171563717
PRODUCT_SYSTEM_PROPERTIES += persist.android.security.keystore2.enable=true
$(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/runtime_libart.mk)