Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a1642c4 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I864468cd7fa93e55f73328433ff95e05a94027ff
parents de136dec f87aae53

java/app.go

+3 −3
Original line number Diff line number Diff line
@@ -1262,12 +1262,12 @@ func (u *usesLibrary) classLoaderContextForUsesLibDeps(ctx android.ModuleContext 
			return

		}



		dep := ctx.OtherModuleName(m)

		dep := android.RemoveOptionalPrebuiltPrefix(ctx.OtherModuleName(m))



		if lib, ok := m.(UsesLibraryDependency); ok {

			libName := android.RemoveOptionalPrebuiltPrefix(dep)

			libName := dep

			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

				// order to pass verify_uses_libraries check (which compares these properties

				// against library names written in the manifest).