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

Merge "Provide a resource_prefix_strip for java_resources in bp2build." am: c144c08d2a am: e30e950cca am: b25bd9c8b3

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

Change-Id: I6114f97deef8dcc2da33a8f29425d3fa2b0e8b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-05 03:14:56 +00:00
committed by Automerger Merge Worker
parent b416545fa8 b25bd9c8b3
commit 6bfbc85161
3 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java.go
View File

@@ -2709,8 +2709,13 @@ func (m *Library) convertJavaResourcesAttributes(ctx android.TopDownMutatorConte
var resources bazel.LabelList
var resourceStripPrefix *string
if m.properties.Java_resources != nil && len(m.properties.Java_resource_dirs) > 0 {
ctx.ModuleErrorf("bp2build doesn't support both java_resources and java_resource_dirs being set on the same module.")
}
if m.properties.Java_resources != nil {
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