Merge "Drop "prebuilt_" prefix when adding libraries to class loader context." (bd14f9a9) · Commits · e / os / android_build_soong

dexpreopt/class_loader_context.go

+3 −0

Original line number	Diff line number	Diff line
		@@ -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) {