Merge "Don't attempt to add stub libraries to class loader context." am:... (5e90cb3b) · Commits · e / os / android_build_soong

dexpreopt/class_loader_context.go

+11 −3

Original line number	Diff line number	Diff line
		@@ -286,11 +286,19 @@ func (clcMap ClassLoaderContextMap) addContext(ctx android.ModuleInstallPathCont
		}
		subcontexts := nestedClcMap[AnySdkVersion]

		// If the library with this name is already present as one of the unconditional top-level
		// components, do not re-add it.
		// Check if the library with this name is already present in unconditional top-level CLC.
		for _, clc := range clcMap[sdkVer] {
		if clc.Name == lib {
		if clc.Name != lib {
		// Ok, a different library.
		} else if clc.Host == hostPath && clc.Device == devicePath {
		// Ok, the same library with the same paths. Don't re-add it, but don't raise an error
		// either, as the same library may be reachable via different transitional dependencies.
		return nil
		} else {
		// Fail, as someone is trying to add the same library with different paths. This likely
		// indicates an error somewhere else, like trying to add a stub library.
		return fmt.Errorf("a <uses-library> named %q is already in class loader context,"+
		"but the library paths are different:\t\n", lib)
		}
		}

java/app.go

+9 −0

Original line number	Diff line number	Diff line
		@@ -1264,6 +1264,15 @@ func (u *usesLibrary) classLoaderContextForUsesLibDeps(ctx android.ModuleContext

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

		// Skip stub libraries. A dependency on the implementation library has been added earlier,
		// so it will be added to CLC, but the stub shouldn't be. Stub libraries can be distingushed
		// from implementation libraries by their name, which is different as it has a suffix.
		if comp, ok := m.(SdkLibraryComponentDependency); ok {
		if impl := comp.OptionalSdkLibraryImplementation(); impl != nil && *impl != dep {
		return
		}
		}

		if lib, ok := m.(UsesLibraryDependency); ok {
		libName := dep
		if ulib, ok := m.(ProvidesUsesLib); ok && ulib.ProvidesUsesLib() != nil {

java/java.go

+17 −20

Original line number	Diff line number	Diff line
		@@ -1786,22 +1786,16 @@ func addCLCFromDep(ctx android.ModuleContext, depModule android.Module,
		return
		}

		// Find out if the dependency is either an SDK library or an ordinary library that is disguised
		// as an SDK library by the means of `provides_uses_lib` property. If yes, the library is itself
		// a <uses-library> and should be added as a node in the CLC tree, and its CLC should be added
		// as subtree of that node. Otherwise the library is not a <uses_library> and should not be
		// added to CLC, but the transitive <uses-library> dependencies from its CLC should be added to
		// the current CLC.
		var implicitSdkLib *string
		comp, isComp := depModule.(SdkLibraryComponentDependency)
		if isComp {
		implicitSdkLib = comp.OptionalImplicitSdkLibrary()
		// OptionalImplicitSdkLibrary() may be nil so need to fall through to ProvidesUsesLib().
		}
		if implicitSdkLib == nil {
		if ulib, ok := depModule.(ProvidesUsesLib); ok {
		implicitSdkLib = ulib.ProvidesUsesLib()
		}
		depName := android.RemoveOptionalPrebuiltPrefix(ctx.OtherModuleName(depModule))

		var sdkLib *string
		if lib, ok := depModule.(SdkLibraryDependency); ok && lib.sharedLibrary() {
		// A shared SDK library. This should be added as a top-level CLC element.
		sdkLib = &depName
		} else if ulib, ok := depModule.(ProvidesUsesLib); ok {
		// A non-SDK library disguised as an SDK library by the means of `provides_uses_lib`
		// property. This should be handled in the same way as a shared SDK library.
		sdkLib = ulib.ProvidesUsesLib()
		}

		depTag := ctx.OtherModuleDependencyTag(depModule)
		@@ -1811,7 +1805,7 @@ func addCLCFromDep(ctx android.ModuleContext, depModule android.Module,
		// Propagate <uses-library> through static library dependencies, unless it is a component
		// library (such as stubs). Component libraries have a dependency on their SDK library,
		// which should not be pulled just because of a static component library.
		if implicitSdkLib != nil {
		if sdkLib != nil {
		return
		}
		} else {
		@@ -1819,11 +1813,14 @@ func addCLCFromDep(ctx android.ModuleContext, depModule android.Module,
		return
		}

		if implicitSdkLib != nil {
		clcMap.AddContext(ctx, dexpreopt.AnySdkVersion, *implicitSdkLib,
		// If this is an SDK (or SDK-like) library, then it should be added as a node in the CLC tree,
		// and its CLC should be added as subtree of that node. Otherwise the library is not a
		// <uses_library> and should not be added to CLC, but the transitive <uses-library> dependencies
		// from its CLC should be added to the current CLC.
		if sdkLib != nil {
		clcMap.AddContext(ctx, dexpreopt.AnySdkVersion, *sdkLib,
		dep.DexJarBuildPath(), dep.DexJarInstallPath(), dep.ClassLoaderContexts())
		} else {
		depName := ctx.OtherModuleName(depModule)
		clcMap.AddContextMap(dep.ClassLoaderContexts(), depName)
		}
		}