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

Merge "Add a key directory argument to insertkeys.py"

Browse source
This commit is contained in:
Geremy Condra 2013-03-28 02:36:26 +00:00 committed by Android (Google) Code Review
commit 7c89b6b0b0
3 changed files with 13 additions and 10 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)
@mkdir -p $(dir $@)
$(hide) $(HOST_OUT_EXECUTABLES)/insertkeys.py -t $(TARGET_BUILD_VARIANT) -c $(TOP) $< -o $@ $(ALL_MAC_PERMS_FILES)
$(hide) $(HOST_OUT_EXECUTABLES)/insertkeys.py -t $(TARGET_BUILD_VARIANT) -d $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE)) -c $(TOP) $< -o $@ $(ALL_MAC_PERMS_FILES)
mac_perms_keys.tmp :=
##################################

12
keys.conf
View file

@ -9,17 +9,17 @@
#
[@PLATFORM]
ALL : build/target/product/security/platform.x509.pem
ALL : platform.x509.pem
[@MEDIA]
ALL : build/target/product/security/media.x509.pem
ALL : media.x509.pem
[@SHARED]
ALL : build/target/product/security/shared.x509.pem
ALL : 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 : testkey.x509.pem
USER : testkey.x509.pem
USERDEBUG : testkey.x509.pem

9
tools/insertkeys.py
View file

@ -65,7 +65,7 @@ class ParseConfig(ConfigParser.ConfigParser):
# This must be lowercase
OPTION_WILDCARD_TAG = "all"
def generateKeyMap(self, target_build_variant):
def generateKeyMap(self, target_build_variant, key_directory):
keyMap = dict()
@ -87,7 +87,7 @@ class ParseConfig(ConfigParser.ConfigParser):
if tag in keyMap:
sys.exit("Duplicate tag detected " + tag)
path = self.get(tag, option)
path = os.path.join(key_directory, self.get(tag, option))
keyMap[tag] = GenerateKeys(path)
@ -188,6 +188,9 @@ if __name__ == "__main__":
parser.add_option("-t", "--target-build-variant", default="eng", dest="target_build_variant",
help="Specify the TARGET_BUILD_VARIANT, defaults to eng")
parser.add_option("-d", "--key-directory", default="", dest="key_directory",
help="Specify a parent directory for keys")
(options, args) = parser.parse_args()
if len(args) < 2:
@ -205,7 +208,7 @@ if __name__ == "__main__":
logging.info("Setting output file to: " + options.output_file)
# Generate the key list
key_map = config.generateKeyMap(options.target_build_variant.lower())
key_map = config.generateKeyMap(options.target_build_variant.lower(), options.key_directory)
logging.info("Generate key map:")
for k in key_map:
logging.info(k + " : " + str(key_map[k]))