diff options
| author | 2025-03-10 12:39:33 -0700 | |
|---|---|---|
| committer | 2025-03-10 12:39:33 -0700 | |
| commit | cfbdb0cec0d89feccb3cd8231a4095f673f74b29 (patch) | |
| tree | 84f42d56428df81062fba6fc517df282bf5dd121 /dexpreopt/class_loader_context.go | |
| parent | f7aff144b2e7deda4e805e2c13e28c66a42d07d1 (diff) | |
| parent | 5d180163896dda388a00d739244e5270a7f8f885 (diff) | |
Merge "Do not propagate boot jars in CLC construction" into main
Diffstat (limited to 'dexpreopt/class_loader_context.go')
| -rw-r--r-- | dexpreopt/class_loader_context.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/dexpreopt/class_loader_context.go b/dexpreopt/class_loader_context.go index af1d33da6..7f50912b5 100644 --- a/dexpreopt/class_loader_context.go +++ b/dexpreopt/class_loader_context.go @@ -291,6 +291,11 @@ func (clcMap ClassLoaderContextMap) addContext(ctx android.ModuleInstallPathCont // For prebuilts, library should have the same name as the source module. lib = android.RemoveOptionalPrebuiltPrefix(lib) + // Bootclasspath libraries should not be added to CLC. + if android.InList(lib, ctx.Config().BootJars()) { + return nil + } + devicePath := UnknownInstallLibraryPath if installPath == nil { if android.InList(lib, CompatUsesLibs) || android.InList(lib, OptionalCompatUsesLibs) { |