summaryrefslogtreecommitdiff
path: root/scripts/manifest_fixer_test.py
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-05-08 09:48:24 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-05-08 09:48:24 +0000
commitd02d71057082fa14e43d02bcead3d2999e3893c2 (patch)
treea310b33e743443ac8c619584b637d29a18d1d935 /scripts/manifest_fixer_test.py
parent14f7714fb475d9fdd3e381c5c390a49b509aaf52 (diff)
parenta71b90cf810cfdd2bc74e7fcf7a2741fce14ff4f (diff)
Merge changes from topic "revert-3075263-MMTOVXSVUO" into main
* changes: Revert "Always embed jni libs and store uncompressed" Revert "Collect transitve deps of jni libs only for bundled apps"
Diffstat (limited to 'scripts/manifest_fixer_test.py')
-rwxr-xr-xscripts/manifest_fixer_test.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/manifest_fixer_test.py b/scripts/manifest_fixer_test.py
index 9fce6b9b8..0a62b10a4 100755
--- a/scripts/manifest_fixer_test.py
+++ b/scripts/manifest_fixer_test.py
@@ -479,8 +479,8 @@ class AddExtractNativeLibsTest(unittest.TestCase):
self.assert_xml_equal(output, expected)
def test_conflict(self):
- manifest_input = self.manifest_tmpl % self.extract_native_libs('false')
- self.assertRaises(RuntimeError, self.run_test, manifest_input, True)
+ manifest_input = self.manifest_tmpl % self.extract_native_libs('true')
+ self.assertRaises(RuntimeError, self.run_test, manifest_input, False)
class AddNoCodeApplicationTest(unittest.TestCase):