Merge "Adding output_path arg to sign_sepolicy_path call" am: 6c4e194cff
am: 12355027d4
Original change: https://android-review.googlesource.com/c/platform/build/+/2193595 Change-Id: I76f747193d1b284e5b7f561ad8b55a186aa3cb5b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
52bcca3bd7
@@ -2392,6 +2392,7 @@ def SignSePolicy(sepolicy, key, password):
|
||||
"""
|
||||
|
||||
if OPTIONS.sign_sepolicy_path is None:
|
||||
logger.info("No sign_sepolicy_path specified, %s was not signed", sepolicy)
|
||||
return False
|
||||
|
||||
java_library_path = os.path.join(
|
||||
@@ -2404,7 +2405,7 @@ def SignSePolicy(sepolicy, key, password):
|
||||
|
||||
cmd.extend([key + OPTIONS.public_key_suffix,
|
||||
key + OPTIONS.private_key_suffix,
|
||||
sepolicy])
|
||||
sepolicy, os.path.dirname(sepolicy)])
|
||||
|
||||
proc = Run(cmd, stdin=subprocess.PIPE)
|
||||
if password is not None:
|
||||
|
Reference in New Issue
Block a user