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

Merge "Fix handling of "prebuilt_" prefix in classLoaderContextForUsesLibDeps." am: f87aae5356

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

Change-Id: I864468cd7fa93e55f73328433ff95e05a94027ff
This commit is contained in:
Ulyana Trafimovich
2021-07-16 12:20:44 +00:00
committed by Automerger Merge Worker
parent de136dec72 f87aae5356
commit 7a1642c416
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/app.go
View File

@@ -1262,12 +1262,12 @@ func (u *usesLibrary) classLoaderContextForUsesLibDeps(ctx android.ModuleContext
return return
} }
dep := ctx.OtherModuleName(m) dep := android.RemoveOptionalPrebuiltPrefix(ctx.OtherModuleName(m))
if lib, ok := m.(UsesLibraryDependency); ok { if lib, ok := m.(UsesLibraryDependency); ok {
libName := android.RemoveOptionalPrebuiltPrefix(dep) libName := dep
if ulib, ok := m.(ProvidesUsesLib); ok && ulib.ProvidesUsesLib() != nil { if ulib, ok := m.(ProvidesUsesLib); ok && ulib.ProvidesUsesLib() != nil {
libName = android.RemoveOptionalPrebuiltPrefix(*ulib.ProvidesUsesLib()) libName = *ulib.ProvidesUsesLib()
// Replace module name with library name in `uses_libs`/`optional_uses_libs` in // Replace module name with library name in `uses_libs`/`optional_uses_libs` in
// order to pass verify_uses_libraries check (which compares these properties // order to pass verify_uses_libraries check (which compares these properties
// against library names written in the manifest). // against library names written in the manifest).