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

Merge "Exclude exported_java_libs dependencies from visibility checks" am: 1a75902832 am: d3cbf8531a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I82fc68bd34b3255ccf03547a7a5511bf7eceee71
This commit is contained in:
Paul Duffin
2021-02-08 19:19:08 +00:00
committed by Automerger Merge Worker
parent 98812a68a5 d3cbf8531a
commit 7d83aa8d86
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
apex/prebuilt.go
View File

@@ -260,12 +260,36 @@ func prebuiltSelectSourceMutator(ctx android.BottomUpMutatorContext) {
} }
} }
type exportedDependencyTag struct {
blueprint.BaseDependencyTag
name string
}
// Mark this tag so dependencies that use it are excluded from visibility enforcement.
//
// This does allow any prebuilt_apex to reference any module which does open up a small window for
// restricted visibility modules to be referenced from the wrong prebuilt_apex. However, doing so
// avoids opening up a much bigger window by widening the visibility of modules that need files
// provided by the prebuilt_apex to include all the possible locations they may be defined, which
// could include everything below vendor/.
//
// A prebuilt_apex that references a module via this tag will have to contain the appropriate files
// corresponding to that module, otherwise it will fail when attempting to retrieve the files from
// the .apex file. It will also have to be included in the module's apex_available property too.
// That makes it highly unlikely that a prebuilt_apex would reference a restricted module
// incorrectly.
func (t exportedDependencyTag) ExcludeFromVisibilityEnforcement() {}
var (
exportedJavaLibTag = exportedDependencyTag{name: "exported_java_lib"}
)
func (p *Prebuilt) DepsMutator(ctx android.BottomUpMutatorContext) { func (p *Prebuilt) DepsMutator(ctx android.BottomUpMutatorContext) {
// Add dependencies onto the java modules that represent the java libraries that are provided by // Add dependencies onto the java modules that represent the java libraries that are provided by
// and exported from this prebuilt apex. // and exported from this prebuilt apex.
for _, lib := range p.properties.Exported_java_libs { for _, lib := range p.properties.Exported_java_libs {
dep := prebuiltApexExportedModuleName(ctx, lib) dep := prebuiltApexExportedModuleName(ctx, lib)
ctx.AddFarVariationDependencies(ctx.Config().AndroidCommonTarget.Variations(), javaLibTag, dep) ctx.AddFarVariationDependencies(ctx.Config().AndroidCommonTarget.Variations(), exportedJavaLibTag, dep)
} }
} }
@@ -305,7 +329,7 @@ func (p *Prebuilt) ApexInfoMutator(mctx android.TopDownMutatorContext) {
var dependencies []android.ApexModule var dependencies []android.ApexModule
mctx.VisitDirectDeps(func(m android.Module) { mctx.VisitDirectDeps(func(m android.Module) {
tag := mctx.OtherModuleDependencyTag(m) tag := mctx.OtherModuleDependencyTag(m)
if tag == javaLibTag { if tag == exportedJavaLibTag {
depName := mctx.OtherModuleName(m) depName := mctx.OtherModuleName(m)
// It is an error if the other module is not a prebuilt. // It is an error if the other module is not a prebuilt.