aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShinichiro Hamaji2016-05-13 02:04:58 -0500
committerShinichiro Hamaji2016-05-13 02:04:58 -0500
commitef0c14d3a2a469081a99111e48a3d421d4fe8d5b (patch)
tree40fee1e5c0fe1335ecaa72384ad256525d28820a /Android.mk
parent3ba2d466160badc90dbec6f83d9dd0bb4fe59846 (diff)
downloadsystem-sepolicy-ef0c14d3a2a469081a99111e48a3d421d4fe8d5b.tar.gz
system-sepolicy-ef0c14d3a2a469081a99111e48a3d421d4fe8d5b.tar.xz
system-sepolicy-ef0c14d3a2a469081a99111e48a3d421d4fe8d5b.zip
Add keys to prerequisites of mac_permissions.xml
Bug: 27954979 Change-Id: Ia0403e2dc2726523a41742e23beff29b47274392
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index a382734c..d5b8a4d4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -462,8 +462,12 @@ $(mac_perms_keys.tmp): $(call build_policy, keys.conf)
462 462
463all_mac_perms_files := $(call build_policy, $(LOCAL_MODULE)) 463all_mac_perms_files := $(call build_policy, $(LOCAL_MODULE))
464 464
465# Should be synced with keys.conf.
466all_keys := platform media shared testkey
467all_keys := $(all_keys:%=$(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))/%.x509.pem)
468
465$(LOCAL_BUILT_MODULE): PRIVATE_MAC_PERMS_FILES := $(all_mac_perms_files) 469$(LOCAL_BUILT_MODULE): PRIVATE_MAC_PERMS_FILES := $(all_mac_perms_files)
466$(LOCAL_BUILT_MODULE): $(mac_perms_keys.tmp) $(HOST_OUT_EXECUTABLES)/insertkeys.py $(all_mac_perms_files) 470$(LOCAL_BUILT_MODULE): $(mac_perms_keys.tmp) $(HOST_OUT_EXECUTABLES)/insertkeys.py $(all_mac_perms_files) $(all_keys)
467 @mkdir -p $(dir $@) 471 @mkdir -p $(dir $@)
468 $(hide) DEFAULT_SYSTEM_DEV_CERTIFICATE="$(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))" \ 472 $(hide) DEFAULT_SYSTEM_DEV_CERTIFICATE="$(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))" \
469 $(HOST_OUT_EXECUTABLES)/insertkeys.py -t $(TARGET_BUILD_VARIANT) -c $(TOP) $< -o $@ $(PRIVATE_MAC_PERMS_FILES) 473 $(HOST_OUT_EXECUTABLES)/insertkeys.py -t $(TARGET_BUILD_VARIANT) -c $(TOP) $< -o $@ $(PRIVATE_MAC_PERMS_FILES)