manifest_check.py: trim namespace part of the module, if needed.

Normally Soong does that automatically when it handles module names
specified in Android.bp properties. However not all <uses-library>
entries in the manifest correspond to real modules: some of the
optional libraries may be missing at build time. Therefor this script
accepts raw module names as spelled in Android.bp/Amdroid.mk and trims
the optional namespace part manually.

Bug: 193891722
Test: manifest_check_test.py
Test: $ lunch aosp_cf_x86_64_phone-userdebug && m && launch_cvd
      $ adb wait-for-device && \
        adb root && \
        adb logcat | \
        grep -E 'ClassLoaderContext [a-z ]+ mismatch' -C1
      # empty output, no errors

Change-Id: I184fb8a2dc26f49e90fb597ebcd6a58c00705206
This commit is contained in:
Ulya Trafimovich
2021-07-20 14:27:32 +01:00
parent ae86338676
commit 1b513458b1
2 changed files with 29 additions and 0 deletions

View File

@@ -183,6 +183,15 @@ class EnforceUsesLibrariesTest(unittest.TestCase):
optional_uses_libraries=['bar'])
self.assertTrue(matches)
def test_mixed_with_namespace(self):
xml = self.xml_tmpl % ('\n'.join([uses_library_xml('foo'),
uses_library_xml('bar', required_xml(False))]))
apk = self.apk_tmpl % ('\n'.join([uses_library_apk('foo'),
uses_library_apk('bar', required_apk(False))]))
matches = self.run_test(xml, apk, uses_libraries=['//x/y/z:foo'],
optional_uses_libraries=['//x/y/z:bar'])
self.assertTrue(matches)
class ExtractTargetSdkVersionTest(unittest.TestCase):
def run_test(self, xml, apk, version):