StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

releasetools: Deprecate GKI build rules

Browse Source 
We no longer build GKIs from the platform tree.
These build commands were neither used nor maintained anymore, so clean
them up to reduce maintenance effort.

Bug: 229701033
Fix: 229701033
Test: presubmit
Change-Id: Ie882fccd864920289e48366e99a4ebd67e784d0d
This commit is contained in:
Yi-Yo Chiang
2023-11-24 15:06:36 +08:00
parent d6f568f587
commit faaede0f01
6 changed files with 3 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tools/releasetools/sign_target_files_apks.py
View File

@@ -123,17 +123,6 @@ Usage: sign_target_files_apks [flags] input_target_files output_target_files
mounted on the partition (e.g. "--signing_helper /path/to/helper"). The
args will be appended to the existing ones in info dict.
--gki_signing_algorithm <algorithm>
--gki_signing_key <key>
Use the specified algorithm (e.g. SHA256_RSA4096) and the key to generate
'boot signature' in a v4 boot.img. Otherwise it uses the existing values
in info dict.
--gki_signing_extra_args <args>
Specify any additional args that are needed to generate 'boot signature'
(e.g. --prop foo:bar). The args will be appended to the existing ones
in info dict.
--android_jar_path <path>
Path to the android.jar to repack the apex file.
@@ -193,9 +182,6 @@ OPTIONS.tag_changes = ("-test-keys", "-dev-keys", "+release-keys")
OPTIONS.avb_keys = {}
OPTIONS.avb_algorithms = {}
OPTIONS.avb_extra_args = {}
OPTIONS.gki_signing_key = None
OPTIONS.gki_signing_algorithm = None
OPTIONS.gki_signing_extra_args = None
OPTIONS.android_jar_path = None
OPTIONS.vendor_partitions = set()
OPTIONS.vendor_otatools = None
@@ -552,7 +538,7 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
[len(os.path.basename(i.filename)) for i in input_tf_zip.infolist()
if GetApkFileInfo(i.filename, compressed_extension, [])[0]])
except ValueError:
# Sets this to zero for targets without APK files, e.g., gki_arm64.
# Sets this to zero for targets without APK files.
maxsize = 0
system_root_image = misc_info.get("system_root_image") == "true"
@@ -768,9 +754,6 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
if misc_info.get('avb_enable') == 'true':
RewriteAvbProps(misc_info)
# Replace the GKI signing key for boot.img, if any.
ReplaceGkiSigningKey(misc_info)
# Write back misc_info with the latest values.
ReplaceMiscInfoTxt(input_tf_zip, output_tf_zip, misc_info)
@@ -1052,27 +1035,6 @@ def RewriteAvbProps(misc_info):
misc_info[args_key] = result
def ReplaceGkiSigningKey(misc_info):
"""Replaces the GKI signing key."""
key = OPTIONS.gki_signing_key
if not key:
return
algorithm = OPTIONS.gki_signing_algorithm
if not algorithm:
raise ValueError("Missing --gki_signing_algorithm")
print('Replacing GKI signing key with "%s" (%s)' % (key, algorithm))
misc_info["gki_signing_algorithm"] = algorithm
misc_info["gki_signing_key_path"] = key
extra_args = OPTIONS.gki_signing_extra_args
if extra_args:
print('Setting GKI signing args: "%s"' % (extra_args))
misc_info["gki_signing_signature_args"] = extra_args
def BuildKeyMap(misc_info, key_mapping_options):
for s, d in key_mapping_options:
if s is None: # -d option
@@ -1426,12 +1388,6 @@ def main(argv):
# 'oem=--signing_helper_with_files=/tmp/avbsigner.sh'.
partition, extra_args = a.split("=", 1)
OPTIONS.avb_extra_args[partition] = extra_args
elif o == "--gki_signing_key":
OPTIONS.gki_signing_key = a
elif o == "--gki_signing_algorithm":
OPTIONS.gki_signing_algorithm = a
elif o == "--gki_signing_extra_args":
OPTIONS.gki_signing_extra_args = a
elif o == "--vendor_otatools":
OPTIONS.vendor_otatools = a
elif o == "--vendor_partitions":
@@ -1495,9 +1451,6 @@ def main(argv):
"avb_extra_custom_image_key=",
"avb_extra_custom_image_algorithm=",
"avb_extra_custom_image_extra_args=",
"gki_signing_key=",
"gki_signing_algorithm=",
"gki_signing_extra_args=",
"vendor_partitions=",
"vendor_otatools=",
"allow_gsi_debug_sepolicy",