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

Merge "releasetools: Move the AVB salt setup into common.LoadInfoDict()." am: 4b4c3d91b0

Browse Source 
am: 19bd39fe3f

Change-Id: I4b8271f022b7c27420cf8b0b6532b2cced0bd44f
This commit is contained in:
Tao Bao
2018-02-01 00:26:52 +00:00
committed by android-build-merger
parent 8f03b86120 19bd39fe3f
commit d2bc1b9718
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/releasetools/add_img_to_target_files.py
View File

@@ -46,7 +46,6 @@ Usage: add_img_to_target_files [flag] target_files
from __future__ import print_function from __future__ import print_function
import datetime import datetime
import hashlib
import os import os
import shlex import shlex
import shutil import shutil
@@ -668,17 +667,6 @@ def AddImagesToTargetFiles(filename):
has_recovery = (OPTIONS.info_dict.get("no_recovery") != "true") has_recovery = (OPTIONS.info_dict.get("no_recovery") != "true")
if OPTIONS.info_dict.get("avb_enable") == "true":
fp = None
if "build.prop" in OPTIONS.info_dict:
build_prop = OPTIONS.info_dict["build.prop"]
if "ro.build.fingerprint" in build_prop:
fp = build_prop["ro.build.fingerprint"]
elif "ro.build.thumbprint" in build_prop:
fp = build_prop["ro.build.thumbprint"]
if fp:
OPTIONS.info_dict["avb_salt"] = hashlib.sha256(fp).hexdigest()
# A map between partition names and their paths, which could be used when # A map between partition names and their paths, which could be used when
# generating AVB vbmeta image. # generating AVB vbmeta image.
partitions = dict() partitions = dict()

18
tools/releasetools/common.py
View File

@@ -31,12 +31,10 @@ import tempfile
import threading import threading
import time import time
import zipfile import zipfile
from hashlib import sha1, sha256
import blockimgdiff import blockimgdiff
from hashlib import sha1 as sha1
class Options(object): class Options(object):
def __init__(self): def __init__(self):
platform_search_path = { platform_search_path = {
@@ -259,6 +257,20 @@ def LoadInfoDict(input_file, input_dir=None):
d["build.prop"] = LoadBuildProp(read_helper, 'SYSTEM/build.prop') d["build.prop"] = LoadBuildProp(read_helper, 'SYSTEM/build.prop')
d["vendor.build.prop"] = LoadBuildProp(read_helper, 'VENDOR/build.prop') d["vendor.build.prop"] = LoadBuildProp(read_helper, 'VENDOR/build.prop')
# Set up the salt (based on fingerprint or thumbprint) that will be used when
# adding AVB footer.
if d.get("avb_enable") == "true":
fp = None
if "build.prop" in d:
build_prop = d["build.prop"]
if "ro.build.fingerprint" in build_prop:
fp = build_prop["ro.build.fingerprint"]
elif "ro.build.thumbprint" in build_prop:
fp = build_prop["ro.build.thumbprint"]
if fp:
d["avb_salt"] = sha256(fp).hexdigest()
return d return d