Merge branch 'lineage-23.1' of https://github.com/LineageOS/android_build_soong into HEADw16.1

* 'lineage-23.1' of https://github.com/LineageOS/android_build_soong: (528 commits)
  Revert "install_symlink: Make symlink target configurable"
  Reapply "Clear as much of cc.Module as possible after GenerateBuildActions"
  Revert "rust: config: Fix missing CPU variant LD flags in Rust"
  Rename build-flag in outdir
  Revert^4 "cipd: Default CIPD proxy server to on, add opt-out"
  Convert check-vintf-all to phony with actions
  Create a partial implementation of check-vintf-all for soong-only
  Configure RBE rust pool based on build variant
  Revert^3 "Add sdk version check to arr"
  Add jdk.internal.invoke to the allowlist
  Make droid always depend on symbols zip
  Import Device and Odm skus
  Don't install gob_gen in Soong
  Remove bazel reference from run_integration_tests.sh
  Fix bootstrap_test.sh
  Don't panic in aconfig libraries when AllowMissingDependencies is set
  Avoid returning nil paths from PathForModuleSrc
  Revert "Flag controled clang version"
  Rework module target dependencies on required deps
  Revert^2 "Add sdk version check to arr"
  ...

Change-Id: I6e9a63fa14fda917a42e426e5dcebbad7f67e1de

1 files changed, 15 insertions, 7 deletions

diff --git a/scripts/manifest_check_test.py b/scripts/manifest_check_test.py
index abe0d8b0e..eedce18b6 100755
--- a/scripts/manifest_check_test.py
+++ b/scripts/manifest_check_test.py
@@ -45,18 +45,17 @@ class EnforceUsesLibrariesTest(unittest.TestCase):
     """Unit tests for add_extract_native_libs function."""
 
     def run_test(self, xml, apk, uses_libraries=(), optional_uses_libraries=(),
-                 missing_optional_uses_libraries=()):  #pylint: disable=dangerous-default-value
+                 missing_optional_uses_libraries=(),
+                 bootclasspath_libs=()):  #pylint: disable=dangerous-default-value
         doc = minidom.parseString(xml)
         try:
             relax = False
             manifest_check.enforce_uses_libraries(
                 doc, uses_libraries, optional_uses_libraries, missing_optional_uses_libraries,
-                relax, False, 'path/to/X/AndroidManifest.xml')
-            manifest_check.enforce_uses_libraries(apk, uses_libraries,
-                                                  optional_uses_libraries,
-                                                  missing_optional_uses_libraries,
-                                                  relax, True,
-                                                  'path/to/X/X.apk')
+                relax, False, 'path/to/X/AndroidManifest.xml', bootclasspath_libs)
+            manifest_check.enforce_uses_libraries(
+                apk, uses_libraries, optional_uses_libraries, missing_optional_uses_libraries,
+                relax, True, 'path/to/X/X.apk', bootclasspath_libs)
             return True
         except manifest_check.ManifestMismatchError:
             return False
@@ -260,6 +259,15 @@ class EnforceUsesLibrariesTest(unittest.TestCase):
             optional_uses_libraries=['//x/y/z:bar', '//x/y/z:qux'])
         self.assertTrue(matches)
 
+    def test_ignore_bootclasspath_libs(self):
+        xml = self.xml_tmpl % (uses_library_xml('foo', required_xml(True)))
+        apk = self.apk_tmpl % (uses_library_apk('foo', required_apk(True)))
+        xml = self.xml_tmpl % (uses_library_xml('bar', required_xml(False)))
+        apk = self.apk_tmpl % (uses_library_apk('bar', required_apk(False)))
+        matches = self.run_test(xml, apk, uses_libraries=[], optional_uses_libraries=[],
+            bootclasspath_libs=['foo', 'bar'])
+        self.assertTrue(matches)
+
 
 class ExtractTargetSdkVersionTest(unittest.TestCase):