Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d065d27f authored by Ivan Lozano's avatar Ivan Lozano Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android’s inclusive language guidance"... 

Merge "Update language to comply with Android’s inclusive language guidance" am: ad970e69 am: 2c158b29 am: a100b675 am: 4a45687e am: f50f37fa

Original change: https://android-review.googlesource.com/c/platform/build/+/1373981

Change-Id: Iacee9f6386c7d4dcf6d6899adb0fb5a9f5f0396b
parents 8b097d6b f50f37fa

tools/releasetools/apex_utils.py

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ def ParseApexPayloadInfo(avbtool, payload_path): 
    else:

      payload_info[key] = value



  # Sanity check.

  # Validation check.

  for key in ('Algorithm', 'Salt', 'apex.key', 'Hash Algorithm'):

    if key not in payload_info:

      raise ApexInfoError(

tools/releasetools/blockimgdiff.py

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ class BlockImageDiff(object): 
        stashed_blocks -= free_size



      if common.OPTIONS.cache_size is not None:

        # Sanity check: abort if we're going to need more stash space than

        # Validation check: abort if we're going to need more stash space than

        # the allowed size (cache_size * threshold). There are two purposes

        # of having a threshold here. a) Part of the cache may have been

        # occupied by some recovery logs. b) It will buy us some time to deal

tools/releasetools/common.py

+1 −1
Original line number Diff line number Diff line
@@ -1177,7 +1177,7 @@ def BuildVBMeta(image_path, partitions, name, needed_partitions): 
  if args and args.strip():

    split_args = shlex.split(args)

    for index, arg in enumerate(split_args[:-1]):

      # Sanity check that the image file exists. Some images might be defined

      # Check that the image file exists. Some images might be defined

      # as a path relative to source tree, which may not be available at the

      # same location when running this script (we have the input target_files

      # zip only). For such cases, we additionally scan other locations (e.g.

tools/releasetools/ota_from_target_files.py

+1 −1
Original line number Diff line number Diff line
@@ -1940,7 +1940,7 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): 


def GenerateNonAbOtaPackage(target_file, output_file, source_file=None):

  """Generates a non-A/B OTA package."""

  # Sanity check the loaded info dicts first.

  # Check the loaded info dicts first.

  if OPTIONS.info_dict.get("no_recovery") == "true":

    raise common.ExternalError(

        "--- target build has specified no recovery ---")

tools/releasetools/sign_target_files_apks.py

+1 −1
Original line number Diff line number Diff line
@@ -1116,7 +1116,7 @@ def ReadApexKeysInfo(tf_zip): 
              privkey.endswith(privkey_suffix) and

              pubkey[:-pubkey_suffix_len] == privkey[:-privkey_suffix_len])



    # Sanity check on the container key names, as we'll carry them without the

    # Check the container key names, as we'll carry them without the

    # extensions. This doesn't apply to payload keys though, which we will use

    # full names only.

    container_cert = matches.group("CONTAINER_CERT")