Allow shared libraries on bootclasspath
A previous change treated this as an error in order to try and detect issues with misconfigured java_sdk_library modules and/or bootclasspath_fragment modules but unfortunately this is not always an error, e.g. when migrating a library that was a shared library to the bootclasspath. This change stops treating that as an error. Bug: 179354495 Test: m nothing Change-Id: I4a833ab5f4caf86c6cd340090fc65d2c2f141512
This commit is contained in:
parent
34827d4c0e
commit
79fd3d728c
|
@ -384,11 +384,7 @@ 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)
|
||||
}
|
||||
contents = append(contents, module)
|
||||
}
|
||||
})
|
||||
|
||||
|
|
Loading…
Reference in New Issue