commit 1446e714af0b0c358b5ecf37c5d704c96c72cf7c
author Geremy Condra <gcondra@google.com> Tue Mar 19 22:56:32 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 19 22:56:46 2013 +0000
tree d36374b67af4d2c393799c9ecc0ea4665c96d94a
parent 5a2988fcb5f1b76c87d9bf8e671c38d1b03188ab

Revert "Dynamic insertion of pubkey to mac_permissions.xml"

This reverts commit 22fc04103b70dd5a1cb1b5a8309ef20461e06289

Change-Id: I2d91b1262e8d0e82a21ea7c5333b1e86f3ed9bee

Android.mk

diff --git a/Android.mk b/Android.mk
index fa7298d..44c1ef6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -165,23 +165,12 @@
 
 include $(BUILD_SYSTEM)/base_rules.mk
 
-# Build keys.conf
-mac_perms_keys.tmp := $(intermediates)/keys.tmp
-$(mac_perms_keys.tmp) : $(call build_policy, keys.conf)
-	@mkdir -p $(dir $@)
-	$(hide) m4 -s $^ > $@
-
-# Build mac_permissions.xml
-$(MAC_PERMISSION_FILE).tmp := $(intermediates)/$(MAC_PERMISSION_FILE).tmp
-$($(MAC_PERMISSION_FILE).tmp) : $(call build_policy, $(MAC_PERMISSION_FILE))
+mmac := $(intermediates)/$(MAC_PERMISSION_FILE)
+$(mmac) : $(call build_policy, $(MAC_PERMISSION_FILE))
 	@mkdir -p $(dir $@)
 	$(hide) cp $^ $@
 
-$(LOCAL_BUILT_MODULE) : $($(MAC_PERMISSION_FILE).tmp) $(mac_perms_keys.tmp) $(HOST_OUT_EXECUTABLES)/insertkeys.py
-	@mkdir -p $(dir $@)
-	$(HOST_OUT_EXECUTABLES)/insertkeys.py -t $(TARGET_BUILD_VARIANT) -c $(ANDROID_BUILD_TOP) $(mac_perms_keys.tmp) -o $@ $<
-
-$(MAC_PERMISSION_FILE).tmp :=
+mmac :=
 ##################################
 
 build_policy :=