Merge "Add keys to prerequisites of mac_permissions.xml" am: d1eb0ede9c
am: a8f65aa156
* commit 'a8f65aa156331487153456ed111b7feb1434355e':
Add keys to prerequisites of mac_permissions.xml
Change-Id: I9b6f11e61f31ec6c11ec35283eff4936b66497f9
This commit is contained in:
commit
2f7b0514fa
@ -463,8 +463,12 @@ $(mac_perms_keys.tmp): $(call build_policy, keys.conf)
|
||||
|
||||
all_mac_perms_files := $(call build_policy, $(LOCAL_MODULE))
|
||||
|
||||
# Should be synced with keys.conf.
|
||||
all_keys := platform media shared testkey
|
||||
all_keys := $(all_keys:%=$(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))/%.x509.pem)
|
||||
|
||||
$(LOCAL_BUILT_MODULE): PRIVATE_MAC_PERMS_FILES := $(all_mac_perms_files)
|
||||
$(LOCAL_BUILT_MODULE): $(mac_perms_keys.tmp) $(HOST_OUT_EXECUTABLES)/insertkeys.py $(all_mac_perms_files)
|
||||
$(LOCAL_BUILT_MODULE): $(mac_perms_keys.tmp) $(HOST_OUT_EXECUTABLES)/insertkeys.py $(all_mac_perms_files) $(all_keys)
|
||||
@mkdir -p $(dir $@)
|
||||
$(hide) DEFAULT_SYSTEM_DEV_CERTIFICATE="$(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))" \
|
||||
$(HOST_OUT_EXECUTABLES)/insertkeys.py -t $(TARGET_BUILD_VARIANT) -c $(TOP) $< -o $@ $(PRIVATE_MAC_PERMS_FILES)
|
||||
|
Loading…
Reference in New Issue
Block a user