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

Merge changes I1a5615e9,I01a673e7 into main

Browse source 
* changes:
  Remove dependency on non-AB modules
  Make build_image output consistent for partitions w/o build.prop
This commit is contained in:
Treehugger Robot 2024-04-08 19:57:56 +00:00 committed by Gerrit Code Review
commit cfec7d0f7b
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/releasetools/Android.bp
View file

@ -244,7 +244,6 @@ python_library_host {
"boot_signer", "boot_signer",
"brotli", "brotli",
"bsdiff", "bsdiff",
"imgdiff",
"lz4", "lz4",
"mkbootfs", "mkbootfs",
"signapk", "signapk",
@ -308,7 +307,6 @@ python_defaults {
"brotli", "brotli",
"bsdiff", "bsdiff",
"deapexer", "deapexer",
"imgdiff",
"lz4", "lz4",
"mkbootfs", "mkbootfs",
"signapk", "signapk",

7
tools/releasetools/common.py
View file

@ -955,6 +955,13 @@ def LoadInfoDict(input_file, repacking=False):
d["build.prop"] = d["system.build.prop"] d["build.prop"] = d["system.build.prop"]
if d.get("avb_enable") == "true": if d.get("avb_enable") == "true":
build_info = BuildInfo(d, use_legacy_id=True)
# Set up the salt for partitions without build.prop
if build_info.fingerprint:
if "fingerprint" not in d:
d["fingerprint"] = build_info.fingerprint
if "avb_salt" not in d:
d["avb_salt"] = sha256(build_info.fingerprint.encode()).hexdigest()
# Set the vbmeta digest if exists # Set the vbmeta digest if exists
try: try:
d["vbmeta_digest"] = read_helper("META/vbmeta_digest.txt").rstrip() d["vbmeta_digest"] = read_helper("META/vbmeta_digest.txt").rstrip()