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

Merge "Created kotlinAttributes struct" am: eb33a1d474 am: f8cf202b64 am: f736aab4fc

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

Change-Id: I5fc5c80b09dbe2904fda3f6c09605b18adc241ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alix Espino
2023-03-08 22:25:55 +00:00
committed by Automerger Merge Worker
parent c9383d7fb2 f736aab4fc
commit c1dd43e6e4
3 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
java/java.go
View File

@@ -2606,10 +2606,10 @@ func (m *Library) convertJavaResourcesAttributes(ctx android.TopDownMutatorConte
type javaCommonAttributes struct {
*javaResourcesAttributes
Srcs bazel.LabelListAttribute
Plugins bazel.LabelListAttribute
Javacopts bazel.StringListAttribute
Common_srcs bazel.LabelListAttribute
*kotlinAttributes
Srcs bazel.LabelListAttribute
Plugins bazel.LabelListAttribute
Javacopts bazel.StringListAttribute
}
type javaDependencyLabels struct {
@@ -2636,8 +2636,8 @@ type javaAidlLibraryAttributes struct {
// depending on the module type.
type bp2BuildJavaInfo struct {
// separates dependencies into dynamic dependencies and static dependencies.
DepLabels *javaDependencyLabels
hasKotlinSrcs bool
DepLabels *javaDependencyLabels
hasKotlin bool
}
// convertLibraryAttrsBp2Build returns a javaCommonAttributes struct with
@@ -2784,9 +2784,17 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext)
depLabels.Deps = deps
depLabels.StaticDeps = bazel.MakeLabelListAttribute(staticDeps)
hasKotlin := !kotlinSrcs.IsEmpty()
if len(m.properties.Common_srcs) != 0 {
hasKotlin = true
commonAttrs.kotlinAttributes = &kotlinAttributes{
bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrc(ctx, m.properties.Common_srcs)),
}
}
bp2BuildInfo := &bp2BuildJavaInfo{
DepLabels: depLabels,
hasKotlinSrcs: !kotlinSrcs.IsEmpty(),
DepLabels: depLabels,
hasKotlin: hasKotlin,
}
return commonAttrs, bp2BuildInfo
@@ -2799,6 +2807,10 @@ type javaLibraryAttributes struct {
Neverlink bazel.BoolAttribute
}
type kotlinAttributes struct {
Common_srcs bazel.LabelListAttribute
}
func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) {
commonAttrs, bp2BuildInfo := m.convertLibraryAttrsBp2Build(ctx)
depLabels := bp2BuildInfo.DepLabels
@@ -2827,14 +2839,12 @@ func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) {
}
name := m.Name()
if !bp2BuildInfo.hasKotlinSrcs && len(m.properties.Common_srcs) == 0 {
if !bp2BuildInfo.hasKotlin {
props = bazel.BazelTargetModuleProperties{
Rule_class: "java_library",
Bzl_load_location: "//build/bazel/rules/java:library.bzl",
}
} else {
attrs.javaCommonAttributes.Common_srcs = bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrc(ctx, m.properties.Common_srcs))
props = bazel.BazelTargetModuleProperties{
Rule_class: "kt_jvm_library",
Bzl_load_location: "//build/bazel/rules/kotlin:kt_jvm_library.bzl",
@@ -2925,7 +2935,7 @@ func javaBinaryHostBp2Build(ctx android.TopDownMutatorContext, m *Binary) {
Jvm_flags: jvmFlags,
}
if !bp2BuildInfo.hasKotlinSrcs && len(m.properties.Common_srcs) == 0 {
if !bp2BuildInfo.hasKotlin {
attrs.javaCommonAttributes = commonAttrs
attrs.Deps = deps
} else {
@@ -2934,18 +2944,10 @@ func javaBinaryHostBp2Build(ctx android.TopDownMutatorContext, m *Binary) {
Rule_class: "kt_jvm_library",
Bzl_load_location: "//build/bazel/rules/kotlin:kt_jvm_library.bzl",
}
ktAttrs := &javaLibraryAttributes{
Deps: deps,
javaCommonAttributes: &javaCommonAttributes{
Srcs: commonAttrs.Srcs,
Plugins: commonAttrs.Plugins,
Javacopts: commonAttrs.Javacopts,
javaResourcesAttributes: commonAttrs.javaResourcesAttributes,
},
}
if len(m.properties.Common_srcs) != 0 {
ktAttrs.javaCommonAttributes.Common_srcs = bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrc(ctx, m.properties.Common_srcs))
ktAttrs := &javaLibraryAttributes{
Deps: deps,
javaCommonAttributes: commonAttrs,
}
ctx.CreateBazelTargetModule(ktProps, android.CommonAttributes{Name: ktName}, ktAttrs)