Merge "Add MAINLINE_SEPOLICY_DEV_CERTIFICATES to keys.conf" am: 1fc3f318bf

am: b65731efb8

Change-Id: Id6e7f98d25634a910a33c7aa34339373822bebaa
This commit is contained in:
Remi NGUYEN VAN 2019-08-15 01:21:25 -07:00 committed by android-build-merger
commit cc0664f1a2
2 changed files with 2 additions and 1 deletions

View file

@ -27,6 +27,7 @@ $(LOCAL_BUILT_MODULE): $(plat_mac_perms_keys.tmp) $(HOST_OUT_EXECUTABLES)/insert
$(all_plat_mac_perms_files) $(all_plat_keys)
@mkdir -p $(dir $@)
$(hide) DEFAULT_SYSTEM_DEV_CERTIFICATE="$(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))" \
MAINLINE_SEPOLICY_DEV_CERTIFICATES="$(MAINLINE_SEPOLICY_DEV_CERTIFICATES)" \
$(HOST_OUT_EXECUTABLES)/insertkeys.py -t $(TARGET_BUILD_VARIANT) -c $(TOP) $< -o $@ $(PRIVATE_MAC_PERMS_FILES)
all_plat_keys :=

View file

@ -15,7 +15,7 @@ ALL : $DEFAULT_SYSTEM_DEV_CERTIFICATE/platform.x509.pem
ALL : $DEFAULT_SYSTEM_DEV_CERTIFICATE/media.x509.pem
[@NETWORK_STACK]
ALL : $DEFAULT_SYSTEM_DEV_CERTIFICATE/networkstack.x509.pem
ALL : $MAINLINE_SEPOLICY_DEV_CERTIFICATES/networkstack.x509.pem
[@SHARED]
ALL : $DEFAULT_SYSTEM_DEV_CERTIFICATE/shared.x509.pem