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

Merge "Bp2build: handle the case where java_library has only proto srcs" into main am: c90e1ec784 am: bc36c7e264

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

Change-Id: I869460457bdfcbd5a70081cac7b67ad04aed3345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Zi Wang
2023-09-13 02:13:58 +00:00
committed by Automerger Merge Worker
parent 7b9b42697e bc36c7e264
commit 7018df6938
2 changed files with 72 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
java/java.go
View File

@@ -2885,8 +2885,9 @@ type javaAidlLibraryAttributes struct {
// depending on the module type.
type bp2BuildJavaInfo struct {
// separates dependencies into dynamic dependencies and static dependencies.
DepLabels *javaDependencyLabels
hasKotlin bool
DepLabels *javaDependencyLabels
hasKotlin bool
onlyProtoInSrcs bool
}
func javaXsdTargetName(xsd android.XsdConfigBp2buildTargets) string {
@@ -2949,6 +2950,9 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext)
staticDeps.Append(srcPartitions[xsdSrcPartition])
_, protoInSrcs := srcPartitions[protoSrcPartition]
onlyProtoInSrcs := protoInSrcs && len(srcPartitions) == 1
if !srcPartitions[logtagSrcPartition].IsEmpty() {
logtagsLibName := m.Name() + "_logtags"
ctx.CreateBazelTargetModule(
@@ -3086,8 +3090,9 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext)
}
bp2BuildInfo := &bp2BuildJavaInfo{
DepLabels: depLabels,
hasKotlin: hasKotlin,
DepLabels: depLabels,
hasKotlin: hasKotlin,
onlyProtoInSrcs: onlyProtoInSrcs,
}
return commonAttrs, bp2BuildInfo, true
@@ -3127,16 +3132,29 @@ func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) {
depLabels := bp2BuildInfo.DepLabels
deps := depLabels.Deps
exports := depLabels.StaticDeps
if !commonAttrs.Srcs.IsEmpty() {
deps.Append(depLabels.StaticDeps) // we should only append these if there are sources to use them
deps.Append(exports) // we should only append these if there are sources to use them
} else if !deps.IsEmpty() {
ctx.ModuleErrorf("Module has direct dependencies but no sources. Bazel will not allow this.")
if bp2BuildInfo.onlyProtoInSrcs {
// java_library does not accept deps when there are no srcs because
// there is no compilation happening, but it accepts exports.
// bp2build converts this module to 2 java_libraries + java_xx_proto_library + proto_library
// the non-empty deps here are not necessary for compiling the protos, in which case
// they're unnecessary as deps on the java_library as well since they aren't
// being propagated to any dependencies.
// so we can put the deps to exports and drop deps here.
exports.Append(deps)
deps = bazel.LabelListAttribute{}
} else {
ctx.ModuleErrorf("Module has direct dependencies but no sources. Bazel will not allow this.")
}
}
var props bazel.BazelTargetModuleProperties
attrs := &javaLibraryAttributes{
javaCommonAttributes: commonAttrs,
Deps: deps,
Exports: depLabels.StaticDeps,
Exports: exports,
}
name := m.Name()