Loading java/app.go +3 −3 Original line number Original line Diff line number Diff line Loading @@ -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). Loading Loading
java/app.go +3 −3 Original line number Original line Diff line number Diff line Loading @@ -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). Loading