commit dba93a9f2e9b7b144b57e60bd20e78b38d9c23d9
author Nick Kralevich <nnk@google.com> Tue Oct 29 00:06:52 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 29 00:06:53 2013 +0000
tree f5da4b6de19a1db655d51d64e32dc2ec100c230b
parent 067ffcc1e10289bb56e13fa5998c50a2ae2d7992
parent c3c9052bc7bf7f55e66a7560a28800066a6e044b

Merge "Make DEFAULT_SYSTEM_DEV_CERTIFICATE available in keys.conf"

Android.mk

diff --git a/Android.mk b/Android.mk
index 87cfe61..0121b6e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -179,7 +179,8 @@
 
 $(LOCAL_BUILT_MODULE) : $(mac_perms_keys.tmp) $(HOST_OUT_EXECUTABLES)/insertkeys.py $(ALL_MAC_PERMS_FILES)
 	@mkdir -p $(dir $@)
-	$(hide) $(HOST_OUT_EXECUTABLES)/insertkeys.py -t $(TARGET_BUILD_VARIANT) -c $(TOP) $< -o $@ $(ALL_MAC_PERMS_FILES)
+	$(hide) DEFAULT_SYSTEM_DEV_CERTIFICATE="$(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))" \
+		$(HOST_OUT_EXECUTABLES)/insertkeys.py -t $(TARGET_BUILD_VARIANT) -c $(TOP) $< -o $@ $(ALL_MAC_PERMS_FILES)
 
 mac_perms_keys.tmp :=
 ##################################

keys.conf

diff --git a/keys.conf b/keys.conf
index c002897..7a307b5 100644
--- a/keys.conf
+++ b/keys.conf
@@ -9,17 +9,17 @@
 #
 
 [@PLATFORM]
-ALL : build/target/product/security/platform.x509.pem
+ALL : $DEFAULT_SYSTEM_DEV_CERTIFICATE/platform.x509.pem
 
 [@MEDIA]
-ALL : build/target/product/security/media.x509.pem
+ALL : $DEFAULT_SYSTEM_DEV_CERTIFICATE/media.x509.pem
 
 [@SHARED]
-ALL : build/target/product/security/shared.x509.pem
+ALL : $DEFAULT_SYSTEM_DEV_CERTIFICATE/shared.x509.pem
 
 # Example of ALL TARGET_BUILD_VARIANTS
 [@RELEASE]
-ENG       : build/target/product/security/testkey.x509.pem
-USER      : build/target/product/security/testkey.x509.pem
-USERDEBUG : build/target/product/security/testkey.x509.pem
+ENG       : $DEFAULT_SYSTEM_DEV_CERTIFICATE/testkey.x509.pem
+USER      : $DEFAULT_SYSTEM_DEV_CERTIFICATE/testkey.x509.pem
+USERDEBUG : $DEFAULT_SYSTEM_DEV_CERTIFICATE/testkey.x509.pem