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

Merge "bp2build java_resources that only contain a filegroup"

Browse Source
This commit is contained in:
Alix Espino
2023-05-26 13:59:42 +00:00
committed by Gerrit Code Review
parent 8321c1a8fb b29a3cd2aa
commit e5641c51b9
4 changed files with 72 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
java/java.go
View File

@@ -2704,6 +2704,15 @@ type javaResourcesAttributes struct {
Resource_strip_prefix *string
}
func (m *Library) javaResourcesGetSingleFilegroupStripPrefix(ctx android.TopDownMutatorContext) (string, bool) {
if otherM, ok := ctx.ModuleFromName(m.properties.Java_resources[0]); ok && len(m.properties.Java_resources) == 1 {
if fg, isFilegroup := otherM.(android.FileGroupPath); isFilegroup {
return filepath.Join(ctx.OtherModuleDir(otherM), fg.GetPath(ctx)), true
}
}
return "", false
}
func (m *Library) convertJavaResourcesAttributes(ctx android.TopDownMutatorContext) *javaResourcesAttributes {
var resources bazel.LabelList
var resourceStripPrefix *string
@@ -2713,8 +2722,12 @@ func (m *Library) convertJavaResourcesAttributes(ctx android.TopDownMutatorConte
}
if m.properties.Java_resources != nil {
if prefix, ok := m.javaResourcesGetSingleFilegroupStripPrefix(ctx); ok {
resourceStripPrefix = proptools.StringPtr(prefix)
} else {
resourceStripPrefix = proptools.StringPtr(ctx.ModuleDir())
}
resources.Append(android.BazelLabelForModuleSrc(ctx, m.properties.Java_resources))
resourceStripPrefix = proptools.StringPtr(ctx.ModuleDir())
}
//TODO(b/179889880) handle case where glob includes files outside package