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

Commit 8001114a authored by Tianjie Xu's avatar Tianjie Xu Committed by Gerrit Code Review
Browse files

Merge "Update language to comply with Android's inclusive language guidance"

parents c21f30ca a85bdf0b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ def ReadFromInputFile(input_file, fn):
def LoadInfoDict(input_file, repacking=False):
  """Loads the key/value pairs from the given input target_files.

  It reads `META/misc_info.txt` file in the target_files input, does sanity
  It reads `META/misc_info.txt` file in the target_files input, does validation
  checks and returns the parsed key/value pairs for to the given build. It's
  usually called early when working on input target_files files, e.g. when
  generating OTAs, or signing builds. Note that the function may be called
+1 −1
Original line number Diff line number Diff line
@@ -1149,7 +1149,7 @@ def main(argv):
      apex_name, key = a.split("=")
      OPTIONS.extra_apex_payload_keys[apex_name] = key
    elif o == "--skip_apks_with_path_prefix":
      # Sanity check the prefix, which must be in all upper case.
      # Check the prefix, which must be in all upper case.
      prefix = a.split('/')[0]
      if not prefix or prefix != prefix.upper():
        raise ValueError("Invalid path prefix '%s'" % (a,))
+2 −2
Original line number Diff line number Diff line
@@ -87,8 +87,8 @@ class CheckTargetFilesVintfTest(test_utils.ReleaseToolsTestCase):
    return test_dir

  @test_utils.SkipIfExternalToolsUnavailable()
  def test_CheckVintf_sanity(self):
    msg = 'Sanity check with skeleton target files failed.'
  def test_CheckVintf_skeleton(self):
    msg = 'vintf check with skeleton target files failed.'
    test_dir = self.prepare_test_dir('does-not-exist')
    self.assertTrue(CheckVintf(test_dir), msg=msg)

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ class VerifiedBootVersion1VerityImageBuilderTest(ReleaseToolsTestCase):
        os.path.join(get_testdata_dir(), 'testkey_mincrypt'))

  @SkipIfExternalToolsUnavailable()
  def test_Build_SanityCheck(self):
  def test_Build_ValidationCheck(self):
    # A validity check for the test itself: the image shouldn't be verifiable
    # with wrong key.
    self.assertRaises(