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

Update language to comply with Android's inclusive language guidance

Browse Source 
More details in: https://source.android.com/setup/contribute/respectful-code

Bug: 161896447
Test: build, run unittests
Change-Id: I35732333da0dd0c871f3e37c4af1b2211647d1e3
This commit is contained in:
Tianjie
2020-07-29 11:56:19 -07:00
parent ad970e69f3
commit a85bdf0bf0
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/releasetools/common.py
View File

@@ -601,7 +601,7 @@ def ReadFromInputFile(input_file, fn):
def LoadInfoDict(input_file, repacking=False): def LoadInfoDict(input_file, repacking=False):
"""Loads the key/value pairs from the given input target_files. """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 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 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 generating OTAs, or signing builds. Note that the function may be called

2
tools/releasetools/sign_target_files_apks.py
View File

@@ -1149,7 +1149,7 @@ def main(argv):
apex_name, key = a.split("=") apex_name, key = a.split("=")
OPTIONS.extra_apex_payload_keys[apex_name] = key OPTIONS.extra_apex_payload_keys[apex_name] = key
elif o == "--skip_apks_with_path_prefix": 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] prefix = a.split('/')[0]
if not prefix or prefix != prefix.upper(): if not prefix or prefix != prefix.upper():
raise ValueError("Invalid path prefix '%s'" % (a,)) raise ValueError("Invalid path prefix '%s'" % (a,))

4
tools/releasetools/test_check_target_files_vintf.py
View File

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

2
tools/releasetools/test_verity_utils.py
View File

@@ -233,7 +233,7 @@ class VerifiedBootVersion1VerityImageBuilderTest(ReleaseToolsTestCase):
os.path.join(get_testdata_dir(), 'testkey_mincrypt')) os.path.join(get_testdata_dir(), 'testkey_mincrypt'))
@SkipIfExternalToolsUnavailable() @SkipIfExternalToolsUnavailable()
def test_Build_SanityCheck(self): def test_Build_ValidationCheck(self):
# A validity check for the test itself: the image shouldn't be verifiable # A validity check for the test itself: the image shouldn't be verifiable
# with wrong key. # with wrong key.
self.assertRaises( self.assertRaises(