StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow shared libraries on bootclasspath" am: b0f20d134f am: 42a9a2ede6

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

Change-Id: I96dcd94c06aa2cbf12fbf4e0effb708d26658ccb
This commit is contained in:
Paul Duffin
2021-05-14 17:51:21 +00:00
committed by Automerger Merge Worker
parent 94f308c04a 42a9a2ede6
commit 8a9a8ffd2f
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/bootclasspath_fragment.go
View File

@@ -384,11 +384,7 @@ func (b *BootclasspathFragmentModule) GenerateAndroidBuildActions(ctx android.Mo
ctx.VisitDirectDeps(func(module android.Module) { ctx.VisitDirectDeps(func(module android.Module) {
tag := ctx.OtherModuleDependencyTag(module) tag := ctx.OtherModuleDependencyTag(module)
if IsBootclasspathFragmentContentDepTag(tag) { if IsBootclasspathFragmentContentDepTag(tag) {
if sdkLibrary, ok := module.(SdkLibraryDependency); ok && sdkLibrary.sharedLibrary() { contents = append(contents, module)
ctx.PropertyErrorf("contents", "invalid module: %s, shared libraries cannot be on the bootclasspath", ctx.OtherModuleName(module))
} else {
contents = append(contents, module)
}
} }
}) })