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

manifest_fixer: rename to --prefer-code-integrity

Browse Source 
During code review, the name change was suggested.

Test: local CTS passed
Bug: 112037137
Change-Id: I7eb25210afb45c7477b0d606574048a15c9c721d
This commit is contained in:
Victor Hsieh
2019-01-02 14:50:56 -08:00
parent 186c771cb4
commit a2c16c1aa0
5 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dexpreopt/config.go
View File

@@ -83,14 +83,14 @@ type Tools struct {
} }
type ModuleConfig struct { type ModuleConfig struct {
Name string Name string
DexLocation string // dex location on device DexLocation string // dex location on device
BuildPath string BuildPath string
DexPath string DexPath string
PreferIntegrity bool PreferCodeIntegrity bool
UncompressedDex bool UncompressedDex bool
HasApkLibraries bool HasApkLibraries bool
PreoptFlags []string PreoptFlags []string
ProfileClassListing string ProfileClassListing string
ProfileIsTextListing bool ProfileIsTextListing bool

2
dexpreopt/dexpreopt_test.go
View File

@@ -66,7 +66,7 @@ var testModuleConfig = ModuleConfig{
DexLocation: "", DexLocation: "",
BuildPath: "", BuildPath: "",
DexPath: "", DexPath: "",
PreferIntegrity: false, PreferCodeIntegrity: false,
UncompressedDex: false, UncompressedDex: false,
HasApkLibraries: false, HasApkLibraries: false,
PreoptFlags: nil, PreoptFlags: nil,

16
java/dexpreopt.go
View File

@@ -147,14 +147,14 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo
} }
dexpreoptConfig := dexpreopt.ModuleConfig{ dexpreoptConfig := dexpreopt.ModuleConfig{
Name: ctx.ModuleName(), Name: ctx.ModuleName(),
DexLocation: dexLocation, DexLocation: dexLocation,
BuildPath: android.PathForModuleOut(ctx, "dexpreopt", ctx.ModuleName()+".jar").String(), BuildPath: android.PathForModuleOut(ctx, "dexpreopt", ctx.ModuleName()+".jar").String(),
DexPath: dexJarFile.String(), DexPath: dexJarFile.String(),
PreferIntegrity: false, PreferCodeIntegrity: false,
UncompressedDex: uncompressedDex, UncompressedDex: uncompressedDex,
HasApkLibraries: false, HasApkLibraries: false,
PreoptFlags: nil, PreoptFlags: nil,
ProfileClassListing: profileClassListing.String(), ProfileClassListing: profileClassListing.String(),
ProfileIsTextListing: profileIsTextListing, ProfileIsTextListing: profileIsTextListing,

18
scripts/manifest_fixer.py
View File

@@ -61,9 +61,9 @@ def parse_args():
help='specify additional <uses-library> tag to add. android:requred is set to false') help='specify additional <uses-library> tag to add. android:requred is set to false')
parser.add_argument('--uses-non-sdk-api', dest='uses_non_sdk_api', action='store_true', parser.add_argument('--uses-non-sdk-api', dest='uses_non_sdk_api', action='store_true',
help='manifest is for a package built against the platform') help='manifest is for a package built against the platform')
parser.add_argument('--prefer-integrity', dest='prefer_integrity', action='store_true', parser.add_argument('--prefer-code-integrity', dest='prefer_code_integrity', action='store_true',
help=('specify if the app prefers strict integrity. Should not be conflict if ' + help=('specify if the app prefers strict code integrity. Should not be conflict '
'already declared in the manifest.')) 'if already declared in the manifest.'))
parser.add_argument('input', help='input AndroidManifest.xml file') parser.add_argument('input', help='input AndroidManifest.xml file')
parser.add_argument('output', help='output AndroidManifest.xml file') parser.add_argument('output', help='output AndroidManifest.xml file')
return parser.parse_args() return parser.parse_args()
@@ -272,7 +272,7 @@ def add_uses_non_sdk_api(doc):
application.setAttributeNode(attr) application.setAttributeNode(attr)
def add_prefer_integrity(doc): def add_prefer_code_integrity(doc):
manifest = parse_manifest(doc) manifest = parse_manifest(doc)
elems = get_children_with_tag(manifest, 'application') elems = get_children_with_tag(manifest, 'application')
application = elems[0] if len(elems) == 1 else None application = elems[0] if len(elems) == 1 else None
@@ -285,13 +285,13 @@ def add_prefer_integrity(doc):
manifest.insertBefore(doc.createTextNode(indent), first) manifest.insertBefore(doc.createTextNode(indent), first)
manifest.insertBefore(application, first) manifest.insertBefore(application, first)
attr = application.getAttributeNodeNS(android_ns, 'preferIntegrity') attr = application.getAttributeNodeNS(android_ns, 'preferCodeIntegrity')
if attr is None: if attr is None:
attr = doc.createAttributeNS(android_ns, 'android:preferIntegrity') attr = doc.createAttributeNS(android_ns, 'android:preferCodeIntegrity')
attr.value = 'true' attr.value = 'true'
application.setAttributeNode(attr) application.setAttributeNode(attr)
elif attr.value != 'true': elif attr.value != 'true':
raise RuntimeError('existing attribute mismatches the option of --prefer-integrity') raise RuntimeError('existing attribute mismatches the option of --prefer-code-integrity')
def write_xml(f, doc): def write_xml(f, doc):
@@ -321,8 +321,8 @@ def main():
if args.uses_non_sdk_api: if args.uses_non_sdk_api:
add_uses_non_sdk_api(doc) add_uses_non_sdk_api(doc)
if args.prefer_integrity: if args.prefer_code_integrity:
add_prefer_integrity(doc) add_prefer_code_integrity(doc)
with open(args.output, 'wb') as f: with open(args.output, 'wb') as f:
write_xml(f, doc) write_xml(f, doc)

20
scripts/manifest_fixer_test.py
View File

@@ -346,12 +346,12 @@ class AddUsesNonSdkApiTest(unittest.TestCase):
self.assertEqual(output, expected) self.assertEqual(output, expected)
class PreferIntegrityTest(unittest.TestCase): class PreferCodeIntegrityTest(unittest.TestCase):
"""Unit tests for add_prefer_integrity function.""" """Unit tests for add_prefer_code_integrity function."""
def run_test(self, input_manifest): def run_test(self, input_manifest):
doc = minidom.parseString(input_manifest) doc = minidom.parseString(input_manifest)
manifest_fixer.add_prefer_integrity(doc) manifest_fixer.add_prefer_code_integrity(doc)
output = StringIO.StringIO() output = StringIO.StringIO()
manifest_fixer.write_xml(output, doc) manifest_fixer.write_xml(output, doc)
return output.getvalue() return output.getvalue()
@@ -362,23 +362,23 @@ class PreferIntegrityTest(unittest.TestCase):
' <application%s/>\n' ' <application%s/>\n'
'</manifest>\n') '</manifest>\n')
def prefer_integrity(self, value): def prefer_code_integrity(self, value):
return ' android:preferIntegrity="%s"' % value return ' android:preferCodeIntegrity="%s"' % value
def test_manifest_with_undeclared_preference(self): def test_manifest_with_undeclared_preference(self):
manifest_input = self.manifest_tmpl % '' manifest_input = self.manifest_tmpl % ''
expected = self.manifest_tmpl % self.prefer_integrity('true') expected = self.manifest_tmpl % self.prefer_code_integrity('true')
output = self.run_test(manifest_input) output = self.run_test(manifest_input)
self.assertEqual(output, expected) self.assertEqual(output, expected)
def test_manifest_with_prefer_integrity(self): def test_manifest_with_prefer_code_integrity(self):
manifest_input = self.manifest_tmpl % self.prefer_integrity('true') manifest_input = self.manifest_tmpl % self.prefer_code_integrity('true')
expected = manifest_input expected = manifest_input
output = self.run_test(manifest_input) output = self.run_test(manifest_input)
self.assertEqual(output, expected) self.assertEqual(output, expected)
def test_manifest_with_not_prefer_integrity(self): def test_manifest_with_not_prefer_code_integrity(self):
manifest_input = self.manifest_tmpl % self.prefer_integrity('false') manifest_input = self.manifest_tmpl % self.prefer_code_integrity('false')
self.assertRaises(RuntimeError, self.run_test, manifest_input) self.assertRaises(RuntimeError, self.run_test, manifest_input)
if __name__ == '__main__': if __name__ == '__main__':