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

Commit b0f20d13 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Allow shared libraries on bootclasspath"

parents 054619d1 79fd3d72
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
@@ -384,12 +384,8 @@ func (b *BootclasspathFragmentModule) GenerateAndroidBuildActions(ctx android.Mo
	ctx.VisitDirectDeps(func(module android.Module) {
		tag := ctx.OtherModuleDependencyTag(module)
		if IsBootclasspathFragmentContentDepTag(tag) {
			if sdkLibrary, ok := module.(SdkLibraryDependency); ok && sdkLibrary.sharedLibrary() {
				ctx.PropertyErrorf("contents", "invalid module: %s, shared libraries cannot be on the bootclasspath", ctx.OtherModuleName(module))
			} else {
			contents = append(contents, module)
		}
		}
	})

	// Perform hidden API processing.