Merge "Avoid signing debuggable boot-debug.img"
am: f0151b1514
Change-Id: Id1c3d08c2ace0fb0189c51f2447fb866a71fc7c8
This commit is contained in:
@@ -602,6 +602,13 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
|
|||||||
print(" Rewriting AVB public key of system_other in /product")
|
print(" Rewriting AVB public key of system_other in /product")
|
||||||
common.ZipWrite(output_tf_zip, public_key, filename)
|
common.ZipWrite(output_tf_zip, public_key, filename)
|
||||||
|
|
||||||
|
# Should NOT sign boot-debug.img.
|
||||||
|
elif filename in (
|
||||||
|
"BOOT/RAMDISK/force_debuggable",
|
||||||
|
"RECOVERY/RAMDISK/force_debuggable"
|
||||||
|
"RECOVERY/RAMDISK/first_stage_ramdisk/force_debuggable"):
|
||||||
|
raise common.ExternalError("debuggable boot.img cannot be signed")
|
||||||
|
|
||||||
# A non-APK file; copy it verbatim.
|
# A non-APK file; copy it verbatim.
|
||||||
else:
|
else:
|
||||||
common.ZipWriteStr(output_tf_zip, out_info, data)
|
common.ZipWriteStr(output_tf_zip, out_info, data)
|
||||||
|
Reference in New Issue
Block a user