diff options
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 130 |
1 files changed, 70 insertions, 60 deletions
diff --git a/java/java.go b/java/java.go index a00e26f83..0841dad5e 100644 --- a/java/java.go +++ b/java/java.go @@ -2607,10 +2607,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 { @@ -2637,8 +2637,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 @@ -2660,6 +2660,7 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext) } } } + srcs.ResolveExcludes() javaSrcPartition := "java" protoSrcPartition := "proto" @@ -2785,9 +2786,18 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext) depLabels.Deps = deps depLabels.StaticDeps = bazel.MakeLabelListAttribute(staticDeps) + hasKotlin := !kotlinSrcs.IsEmpty() + commonAttrs.kotlinAttributes = &kotlinAttributes{ + Kotlincflags: &m.properties.Kotlincflags, + } + if len(m.properties.Common_srcs) != 0 { + hasKotlin = true + commonAttrs.kotlinAttributes.Common_srcs = bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrc(ctx, m.properties.Common_srcs)) + } + bp2BuildInfo := &bp2BuildJavaInfo{ - DepLabels: depLabels, - hasKotlinSrcs: !kotlinSrcs.IsEmpty(), + DepLabels: depLabels, + hasKotlin: hasKotlin, } return commonAttrs, bp2BuildInfo @@ -2800,6 +2810,25 @@ type javaLibraryAttributes struct { Neverlink bazel.BoolAttribute } +type kotlinAttributes struct { + Common_srcs bazel.LabelListAttribute + Kotlincflags *[]string +} + +func ktJvmLibraryBazelTargetModuleProperties() bazel.BazelTargetModuleProperties { + return bazel.BazelTargetModuleProperties{ + Rule_class: "kt_jvm_library", + Bzl_load_location: "//build/bazel/rules/kotlin:rules.bzl", + } +} + +func javaLibraryBazelTargetModuleProperties() bazel.BazelTargetModuleProperties { + return bazel.BazelTargetModuleProperties{ + Rule_class: "java_library", + Bzl_load_location: "//build/bazel/rules/java:rules.bzl", + } +} + func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) { commonAttrs, bp2BuildInfo := m.convertLibraryAttrsBp2Build(ctx) depLabels := bp2BuildInfo.DepLabels @@ -2828,18 +2857,10 @@ func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) { } name := m.Name() - if !bp2BuildInfo.hasKotlinSrcs && len(m.properties.Common_srcs) == 0 { - props = bazel.BazelTargetModuleProperties{ - Rule_class: "java_library", - Bzl_load_location: "//build/bazel/rules/java:library.bzl", - } + if !bp2BuildInfo.hasKotlin { + props = javaLibraryBazelTargetModuleProperties() } 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: "@rules_kotlin//kotlin:jvm_library.bzl", - } + props = ktJvmLibraryBazelTargetModuleProperties() } ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: name}, attrs) @@ -2918,55 +2939,38 @@ func javaBinaryHostBp2Build(ctx android.TopDownMutatorContext, m *Binary) { } props := bazel.BazelTargetModuleProperties{ - Rule_class: "java_binary", + Rule_class: "java_binary", + Bzl_load_location: "//build/bazel/rules/java:rules.bzl", } - attrs := &javaBinaryHostAttributes{ + binAttrs := &javaBinaryHostAttributes{ Runtime_deps: runtimeDeps, Main_class: mainClass, Jvm_flags: jvmFlags, } - if !bp2BuildInfo.hasKotlinSrcs && len(m.properties.Common_srcs) == 0 { - attrs.javaCommonAttributes = commonAttrs - attrs.Deps = deps - } else { - ktName := m.Name() + "_kt" - ktProps := bazel.BazelTargetModuleProperties{ - Rule_class: "kt_jvm_library", - Bzl_load_location: "@rules_kotlin//kotlin:jvm_library.bzl", - } - ktAttrs := &javaLibraryAttributes{ - Deps: deps, - javaCommonAttributes: &javaCommonAttributes{ - Srcs: commonAttrs.Srcs, - Plugins: commonAttrs.Plugins, - Javacopts: commonAttrs.Javacopts, - }, - } - - if len(m.properties.Common_srcs) != 0 { - ktAttrs.javaCommonAttributes.Common_srcs = bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrc(ctx, m.properties.Common_srcs)) - } - - // kt_jvm_library does not support resource_strip_prefix, if this attribute - // is set, than javaResourcesAttributes needs to be set in the - // javaCommonAttributes of the java_binary target - if commonAttrs.javaResourcesAttributes != nil { - if commonAttrs.javaResourcesAttributes.Resource_strip_prefix != nil { - attrs.javaCommonAttributes = &javaCommonAttributes{ - javaResourcesAttributes: commonAttrs.javaResourcesAttributes, - } - } else { - ktAttrs.javaCommonAttributes.javaResourcesAttributes = commonAttrs.javaResourcesAttributes - } - } + if commonAttrs.Srcs.IsEmpty() { + binAttrs.javaCommonAttributes = commonAttrs + ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: m.Name()}, binAttrs) + return + } - ctx.CreateBazelTargetModule(ktProps, android.CommonAttributes{Name: ktName}, ktAttrs) - attrs.Runtime_deps.Add(&bazel.LabelAttribute{Value: &bazel.Label{Label: ":" + ktName}}) + libName := m.Name() + "_lib" + var libProps bazel.BazelTargetModuleProperties + if bp2BuildInfo.hasKotlin { + libProps = ktJvmLibraryBazelTargetModuleProperties() + } else { + libProps = javaLibraryBazelTargetModuleProperties() + } + libAttrs := &javaLibraryAttributes{ + Deps: deps, + javaCommonAttributes: commonAttrs, } + ctx.CreateBazelTargetModule(libProps, android.CommonAttributes{Name: libName}, libAttrs) + binAttrs.Runtime_deps.Add(&bazel.LabelAttribute{Value: &bazel.Label{Label: ":" + libName}}) + // Create the BazelTargetModule. - ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: m.Name()}, attrs) + ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: m.Name()}, binAttrs) } type bazelJavaImportAttributes struct { @@ -2990,7 +2994,10 @@ func (i *Import) ConvertWithBp2build(ctx android.TopDownMutatorContext) { attrs := &bazelJavaImportAttributes{ Jars: jars, } - props := bazel.BazelTargetModuleProperties{Rule_class: "java_import"} + props := bazel.BazelTargetModuleProperties{ + Rule_class: "java_import", + Bzl_load_location: "//build/bazel/rules/java:rules.bzl", + } name := android.RemoveOptionalPrebuiltPrefix(i.Name()) @@ -3001,7 +3008,10 @@ func (i *Import) ConvertWithBp2build(ctx android.TopDownMutatorContext) { Neverlink: bazel.BoolAttribute{Value: &neverlink}, Exports: bazel.MakeSingleLabelListAttribute(bazel.Label{Label: ":" + name}), } - ctx.CreateBazelTargetModule(bazel.BazelTargetModuleProperties{Rule_class: "java_library"}, android.CommonAttributes{Name: name + "-neverlink"}, neverlinkAttrs) + ctx.CreateBazelTargetModule( + javaLibraryBazelTargetModuleProperties(), + android.CommonAttributes{Name: name + "-neverlink"}, + neverlinkAttrs) } |