StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Drop "prebuilt_" prefix when adding libraries to class loader context." am: bd14f9a952

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1765982

Change-Id: Ic6459e82ac8cd6ddc8aadfe79212a456b4eb847e
This commit is contained in:
Ulyana Trafimovich
2021-07-15 10:26:58 +00:00
committed by Automerger Merge Worker
parent cdaf15d04f bd14f9a952
commit d47262c529
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dexpreopt/class_loader_context.go
View File

@@ -258,6 +258,9 @@ const AnySdkVersion int = android.FutureApiLevelInt
func (clcMap ClassLoaderContextMap) addContext(ctx android.ModuleInstallPathContext, sdkVer int, lib string,
hostPath, installPath android.Path, nestedClcMap ClassLoaderContextMap) error {
// For prebuilts, library should have the same name as the source module.
lib = android.RemoveOptionalPrebuiltPrefix(lib)
devicePath := UnknownInstallLibraryPath
if installPath == nil {
if android.InList(lib, CompatUsesLibs) || android.InList(lib, OptionalCompatUsesLibs) {