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

Commit 42a9a2ed authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Allow shared libraries on bootclasspath" am: b0f20d13 

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

Change-Id: Ia599b240c43ebd916f3bd4f4c0c1a2b2eb512991
parents a1ae5530 b0f20d13

java/bootclasspath_fragment.go

+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.