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, 11 insertions, 4 deletions

diff --git a/java/boot_jars.go b/java/boot_jars.go
index 3c3bd550c..75a35f13c 100644
--- a/java/boot_jars.go
+++ b/java/boot_jars.go
@@ -21,11 +21,18 @@ import (
 // isActiveModule returns true if the given module should be considered for boot
 // jars, i.e. if it's enabled and the preferred one in case of source and
 // prebuilt alternatives.
-func isActiveModule(ctx android.ConfigurableEvaluatorContext, module android.Module) bool {
-	if !module.Enabled(ctx) {
-		return false
+func isActiveModule(ctx android.ModuleContext, module android.ModuleOrProxy) bool {
+	if android.EqualModules(ctx.Module(), module) {
+		if !ctx.Module().Enabled(ctx) {
+			return false
+		}
+	} else {
+		info := android.OtherModuleProviderOrDefault(ctx, module, android.CommonModuleInfoProvider)
+		if !info.Enabled {
+			return false
+		}
 	}
-	return android.IsModulePreferred(module)
+	return android.IsModulePreferredProxy(ctx, module)
 }
 
 // buildRuleForBootJarsPackageCheck generates the build rule to perform the boot jars package