From e4246abd7f456eb4119f2cffc01bdfca852584b5 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 5 Feb 2019 21:55:21 -0800 Subject: Make manifest and APK agree on uncompressed native libs Only put uncompressed native libs in an APK if the min_sdk_version supports it (>= 23, Marshmallow), and set android:extractNativeLibs="false" in the AndroidManifest.xml so that the platform won't extract them anyways. Bug: 117618214 Test: m checkbuild Change-Id: I760017e48bf3c6b618aabde0982df45995765d48 --- scripts/manifest_fixer_test.py | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'scripts/manifest_fixer_test.py') diff --git a/scripts/manifest_fixer_test.py b/scripts/manifest_fixer_test.py index 1d8de5565..4ad9afaf3 100755 --- a/scripts/manifest_fixer_test.py +++ b/scripts/manifest_fixer_test.py @@ -381,5 +381,48 @@ class UseEmbeddedDexTest(unittest.TestCase): manifest_input = self.manifest_tmpl % self.use_embedded_dex('false') self.assertRaises(RuntimeError, self.run_test, manifest_input) + +class AddExtractNativeLibsTest(unittest.TestCase): + """Unit tests for add_extract_native_libs function.""" + + def run_test(self, input_manifest, value): + doc = minidom.parseString(input_manifest) + manifest_fixer.add_extract_native_libs(doc, value) + output = StringIO.StringIO() + manifest_fixer.write_xml(output, doc) + return output.getvalue() + + manifest_tmpl = ( + '\n' + '\n' + ' \n' + '\n') + + def extract_native_libs(self, value): + return ' android:extractNativeLibs="%s"' % value + + def test_set_true(self): + manifest_input = self.manifest_tmpl % '' + expected = self.manifest_tmpl % self.extract_native_libs('true') + output = self.run_test(manifest_input, True) + self.assertEqual(output, expected) + + def test_set_false(self): + manifest_input = self.manifest_tmpl % '' + expected = self.manifest_tmpl % self.extract_native_libs('false') + output = self.run_test(manifest_input, False) + self.assertEqual(output, expected) + + def test_match(self): + manifest_input = self.manifest_tmpl % self.extract_native_libs('true') + expected = manifest_input + output = self.run_test(manifest_input, True) + self.assertEqual(output, expected) + + def test_conflict(self): + manifest_input = self.manifest_tmpl % self.extract_native_libs('true') + self.assertRaises(RuntimeError, self.run_test, manifest_input, False) + + if __name__ == '__main__': unittest.main() -- cgit v1.2.3-59-g8ed1b