From d181c8ba7684b2ca787b7a0389b4c95ebec1f17c Mon Sep 17 00:00:00 2001 From: Victor Hsieh Date: Tue, 29 Jan 2019 13:00:33 -0800 Subject: [PATCH] Rename preferCodeIntegrity to useEmbeddedDex Test: build and run testing app Bug: 112037137 Change-Id: Ia82c2c3ba7eb32117a4be078ac31ee2ba510f9eb --- dexpreopt/config.go | 16 ++++++++-------- dexpreopt/dexpreopt_test.go | 2 +- java/dexpreopt.go | 16 ++++++++-------- scripts/manifest_fixer.py | 19 ++++++++++--------- scripts/manifest_fixer_test.py | 20 ++++++++++---------- 5 files changed, 37 insertions(+), 36 deletions(-) diff --git a/dexpreopt/config.go b/dexpreopt/config.go index 503af7efa..3725146bd 100644 --- a/dexpreopt/config.go +++ b/dexpreopt/config.go @@ -87,14 +87,14 @@ type Tools struct { } type ModuleConfig struct { - Name string - DexLocation string // dex location on device - BuildPath string - DexPath string - PreferCodeIntegrity bool - UncompressedDex bool - HasApkLibraries bool - PreoptFlags []string + Name string + DexLocation string // dex location on device + BuildPath string + DexPath string + UseEmbeddedDex bool + UncompressedDex bool + HasApkLibraries bool + PreoptFlags []string ProfileClassListing string ProfileIsTextListing bool diff --git a/dexpreopt/dexpreopt_test.go b/dexpreopt/dexpreopt_test.go index f218d015d..073d46378 100644 --- a/dexpreopt/dexpreopt_test.go +++ b/dexpreopt/dexpreopt_test.go @@ -66,7 +66,7 @@ var testModuleConfig = ModuleConfig{ DexLocation: "", BuildPath: "", DexPath: "", - PreferCodeIntegrity: false, + UseEmbeddedDex: false, UncompressedDex: false, HasApkLibraries: false, PreoptFlags: nil, diff --git a/java/dexpreopt.go b/java/dexpreopt.go index 2c8de5510..6e46bc91a 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -149,14 +149,14 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo } dexpreoptConfig := dexpreopt.ModuleConfig{ - Name: ctx.ModuleName(), - DexLocation: dexLocation, - BuildPath: android.PathForModuleOut(ctx, "dexpreopt", ctx.ModuleName()+".jar").String(), - DexPath: dexJarFile.String(), - PreferCodeIntegrity: false, - UncompressedDex: d.uncompressedDex, - HasApkLibraries: false, - PreoptFlags: nil, + Name: ctx.ModuleName(), + DexLocation: dexLocation, + BuildPath: android.PathForModuleOut(ctx, "dexpreopt", ctx.ModuleName()+".jar").String(), + DexPath: dexJarFile.String(), + UseEmbeddedDex: false, + UncompressedDex: d.uncompressedDex, + HasApkLibraries: false, + PreoptFlags: nil, ProfileClassListing: profileClassListing.String(), ProfileIsTextListing: profileIsTextListing, diff --git a/scripts/manifest_fixer.py b/scripts/manifest_fixer.py index ebfc4d8a0..917f55b4a 100755 --- a/scripts/manifest_fixer.py +++ b/scripts/manifest_fixer.py @@ -61,9 +61,10 @@ def parse_args(): help='specify additional tag to add. android:requred is set to false') 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') - parser.add_argument('--prefer-code-integrity', dest='prefer_code_integrity', action='store_true', - help=('specify if the app prefers strict code integrity. Should not be conflict ' - 'if already declared in the manifest.')) + parser.add_argument('--use-embedded-dex', dest='use_embedded_dex', action='store_true', + help=('specify if the app wants to use embedded dex and avoid extracted,' + 'locally compiled code. Should not be conflict if already declared ' + 'in the manifest.')) parser.add_argument('input', help='input AndroidManifest.xml file') parser.add_argument('output', help='output AndroidManifest.xml file') return parser.parse_args() @@ -272,7 +273,7 @@ def add_uses_non_sdk_api(doc): application.setAttributeNode(attr) -def add_prefer_code_integrity(doc): +def add_use_embedded_dex(doc): manifest = parse_manifest(doc) elems = get_children_with_tag(manifest, 'application') application = elems[0] if len(elems) == 1 else None @@ -285,13 +286,13 @@ def add_prefer_code_integrity(doc): manifest.insertBefore(doc.createTextNode(indent), first) manifest.insertBefore(application, first) - attr = application.getAttributeNodeNS(android_ns, 'preferCodeIntegrity') + attr = application.getAttributeNodeNS(android_ns, 'useEmbeddedDex') if attr is None: - attr = doc.createAttributeNS(android_ns, 'android:preferCodeIntegrity') + attr = doc.createAttributeNS(android_ns, 'android:useEmbeddedDex') attr.value = 'true' application.setAttributeNode(attr) elif attr.value != 'true': - raise RuntimeError('existing attribute mismatches the option of --prefer-code-integrity') + raise RuntimeError('existing attribute mismatches the option of --use-embedded-dex') def write_xml(f, doc): @@ -321,8 +322,8 @@ def main(): if args.uses_non_sdk_api: add_uses_non_sdk_api(doc) - if args.prefer_code_integrity: - add_prefer_code_integrity(doc) + if args.use_embedded_dex: + add_use_embedded_dex(doc) with open(args.output, 'wb') as f: write_xml(f, doc) diff --git a/scripts/manifest_fixer_test.py b/scripts/manifest_fixer_test.py index edc98cd3a..1d8de5565 100755 --- a/scripts/manifest_fixer_test.py +++ b/scripts/manifest_fixer_test.py @@ -346,12 +346,12 @@ class AddUsesNonSdkApiTest(unittest.TestCase): self.assertEqual(output, expected) -class PreferCodeIntegrityTest(unittest.TestCase): - """Unit tests for add_prefer_code_integrity function.""" +class UseEmbeddedDexTest(unittest.TestCase): + """Unit tests for add_use_embedded_dex function.""" def run_test(self, input_manifest): doc = minidom.parseString(input_manifest) - manifest_fixer.add_prefer_code_integrity(doc) + manifest_fixer.add_use_embedded_dex(doc) output = StringIO.StringIO() manifest_fixer.write_xml(output, doc) return output.getvalue() @@ -362,23 +362,23 @@ class PreferCodeIntegrityTest(unittest.TestCase): ' \n' '\n') - def prefer_code_integrity(self, value): - return ' android:preferCodeIntegrity="%s"' % value + def use_embedded_dex(self, value): + return ' android:useEmbeddedDex="%s"' % value def test_manifest_with_undeclared_preference(self): manifest_input = self.manifest_tmpl % '' - expected = self.manifest_tmpl % self.prefer_code_integrity('true') + expected = self.manifest_tmpl % self.use_embedded_dex('true') output = self.run_test(manifest_input) self.assertEqual(output, expected) - def test_manifest_with_prefer_code_integrity(self): - manifest_input = self.manifest_tmpl % self.prefer_code_integrity('true') + def test_manifest_with_use_embedded_dex(self): + manifest_input = self.manifest_tmpl % self.use_embedded_dex('true') expected = manifest_input output = self.run_test(manifest_input) self.assertEqual(output, expected) - def test_manifest_with_not_prefer_code_integrity(self): - manifest_input = self.manifest_tmpl % self.prefer_code_integrity('false') + def test_manifest_with_not_use_embedded_dex(self): + manifest_input = self.manifest_tmpl % self.use_embedded_dex('false') self.assertRaises(RuntimeError, self.run_test, manifest_input) if __name__ == '__main__':