tequilaOS/platform_system_sepolicy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Drop -d option on insertkeys.py in Android.mk

Browse source 
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>
This commit is contained in:
William Roberts 2013-08-22 11:53:42 -07:00
parent 21d13e9b66
commit 9af6f1bd59
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Android.mk
View file

@ -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) $(LOCAL_BUILT_MODULE) : $(mac_perms_keys.tmp) $(HOST_OUT_EXECUTABLES)/insertkeys.py $(ALL_MAC_PERMS_FILES)
@mkdir -p $(dir $@) @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 := mac_perms_keys.tmp :=
################################## ##################################

12
keys.conf
View file

@ -9,17 +9,17 @@
# #
[@PLATFORM] [@PLATFORM]
ALL : platform.x509.pem ALL : build/target/product/security/platform.x509.pem
[@MEDIA] [@MEDIA]
ALL : media.x509.pem ALL : build/target/product/security/media.x509.pem
[@SHARED] [@SHARED]
ALL : shared.x509.pem ALL : build/target/product/security/shared.x509.pem
# Example of ALL TARGET_BUILD_VARIANTS # Example of ALL TARGET_BUILD_VARIANTS
[@RELEASE] [@RELEASE]
ENG : testkey.x509.pem ENG : build/target/product/security/testkey.x509.pem
USER : testkey.x509.pem USER : build/target/product/security/testkey.x509.pem
USERDEBUG : testkey.x509.pem USERDEBUG : build/target/product/security/testkey.x509.pem