Merge "Fix missing rename of all_keys -> all_plat_keys" am: 0dea10cff7

am: 1909890725

Change-Id: Iacec1ad247cb157258098d58a268ab4458a43000
This commit is contained in:
Dan Willemsen 2019-05-29 15:02:07 -07:00 committed by android-build-merger
commit 8d8452448e

View File

@ -18,7 +18,7 @@ all_plat_mac_perms_files := $(call build_policy, mac_permissions.xml, $(PLAT_PRI
# Should be synced with keys.conf. # Should be synced with keys.conf.
all_plat_keys := platform media shared testkey all_plat_keys := platform media shared testkey
all_plat_keys := $(all_keys:%=$(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))/%.x509.pem) all_plat_keys := $(all_plat_keys:%=$(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))/%.x509.pem)
$(LOCAL_BUILT_MODULE): PRIVATE_MAC_PERMS_FILES := $(all_plat_mac_perms_files) $(LOCAL_BUILT_MODULE): PRIVATE_MAC_PERMS_FILES := $(all_plat_mac_perms_files)
$(LOCAL_BUILT_MODULE): $(plat_mac_perms_keys.tmp) $(HOST_OUT_EXECUTABLES)/insertkeys.py \ $(LOCAL_BUILT_MODULE): $(plat_mac_perms_keys.tmp) $(HOST_OUT_EXECUTABLES)/insertkeys.py \