From 9af6f1bd59ee2fb0622db8ff25c4806c5527a0b3 Mon Sep 17 00:00:00 2001 From: William Roberts <wroberts@tresys.com> Date: Thu, 22 Aug 2013 11:53:42 -0700 Subject: [PATCH] Drop -d option on insertkeys.py in Android.mk This breaks the ability for users to have certs in many directories. Currently the design is to allow keys.conf to specify arbitrary locations for pem files, relative to the root of the Android tree. If users want to have a common prefix on all the keys, then they can export DEFAULT_SYSTEM_DEV_CERTIFICATE, and make that an environment variable in their keys.conf file. Signed-off-by: William Roberts <wroberts@tresys.com> Change-Id: I23455b891206cab6eca7db08ff3c28283f87c640 Signed-off-by: William Roberts <wroberts@tresys.com> --- Android.mk | 2 +- keys.conf | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Android.mk b/Android.mk index eb240cdb0..87cfe6107 100644 --- a/Android.mk +++ b/Android.mk @@ -179,7 +179,7 @@ ALL_MAC_PERMS_FILES := $(call build_policy, $(LOCAL_MODULE)) $(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) -d $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE)) -c $(TOP) $< -o $@ $(ALL_MAC_PERMS_FILES) + $(hide) $(HOST_OUT_EXECUTABLES)/insertkeys.py -t $(TARGET_BUILD_VARIANT) -c $(TOP) $< -o $@ $(ALL_MAC_PERMS_FILES) mac_perms_keys.tmp := ################################## diff --git a/keys.conf b/keys.conf index cca95e960..c00289790 100644 --- a/keys.conf +++ b/keys.conf @@ -9,17 +9,17 @@ # [@PLATFORM] -ALL : platform.x509.pem +ALL : build/target/product/security/platform.x509.pem [@MEDIA] -ALL : media.x509.pem +ALL : build/target/product/security/media.x509.pem [@SHARED] -ALL : shared.x509.pem +ALL : build/target/product/security/shared.x509.pem # Example of ALL TARGET_BUILD_VARIANTS [@RELEASE] -ENG : testkey.x509.pem -USER : testkey.x509.pem -USERDEBUG : testkey.x509.pem +ENG : build/target/product/security/testkey.x509.pem +USER : build/target/product/security/testkey.x509.pem +USERDEBUG : build/target/product/security/testkey.x509.pem -- GitLab