Merge "Created kotlinAttributes struct" am: eb33a1d474
am: f8cf202b64
am: f736aab4fc
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:
@@ -1092,11 +1092,6 @@ func (a *AndroidLibrary) ConvertWithBp2build(ctx android.TopDownMutatorContext)
|
|||||||
} else if !depLabels.Deps.IsEmpty() {
|
} else if !depLabels.Deps.IsEmpty() {
|
||||||
ctx.ModuleErrorf("Module has direct dependencies but no sources. Bazel will not allow this.")
|
ctx.ModuleErrorf("Module has direct dependencies but no sources. Bazel will not allow this.")
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(a.properties.Common_srcs) != 0 {
|
|
||||||
commonAttrs.Common_srcs = bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrc(ctx, a.properties.Common_srcs))
|
|
||||||
}
|
|
||||||
|
|
||||||
name := a.Name()
|
name := a.Name()
|
||||||
props := bazel.BazelTargetModuleProperties{
|
props := bazel.BazelTargetModuleProperties{
|
||||||
Rule_class: "android_library",
|
Rule_class: "android_library",
|
||||||
|
@@ -1528,13 +1528,12 @@ func (a *AndroidApp) ConvertWithBp2build(ctx android.TopDownMutatorContext) {
|
|||||||
Bzl_load_location: "//build/bazel/rules/android:rules.bzl",
|
Bzl_load_location: "//build/bazel/rules/android:rules.bzl",
|
||||||
}
|
}
|
||||||
|
|
||||||
if !bp2BuildInfo.hasKotlinSrcs && len(a.properties.Common_srcs) == 0 {
|
if !bp2BuildInfo.hasKotlin {
|
||||||
appAttrs.javaCommonAttributes = commonAttrs
|
appAttrs.javaCommonAttributes = commonAttrs
|
||||||
appAttrs.bazelAapt = aapt
|
appAttrs.bazelAapt = aapt
|
||||||
appAttrs.Deps = deps
|
appAttrs.Deps = deps
|
||||||
} else {
|
} else {
|
||||||
ktName := a.Name() + "_kt"
|
ktName := a.Name() + "_kt"
|
||||||
commonAttrs.Common_srcs = bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrc(ctx, a.properties.Common_srcs))
|
|
||||||
ctx.CreateBazelTargetModule(
|
ctx.CreateBazelTargetModule(
|
||||||
bazel.BazelTargetModuleProperties{
|
bazel.BazelTargetModuleProperties{
|
||||||
Rule_class: "android_library",
|
Rule_class: "android_library",
|
||||||
|
36
java/java.go
36
java/java.go
@@ -2606,10 +2606,10 @@ func (m *Library) convertJavaResourcesAttributes(ctx android.TopDownMutatorConte
|
|||||||
|
|
||||||
type javaCommonAttributes struct {
|
type javaCommonAttributes struct {
|
||||||
*javaResourcesAttributes
|
*javaResourcesAttributes
|
||||||
|
*kotlinAttributes
|
||||||
Srcs bazel.LabelListAttribute
|
Srcs bazel.LabelListAttribute
|
||||||
Plugins bazel.LabelListAttribute
|
Plugins bazel.LabelListAttribute
|
||||||
Javacopts bazel.StringListAttribute
|
Javacopts bazel.StringListAttribute
|
||||||
Common_srcs bazel.LabelListAttribute
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type javaDependencyLabels struct {
|
type javaDependencyLabels struct {
|
||||||
@@ -2637,7 +2637,7 @@ type javaAidlLibraryAttributes struct {
|
|||||||
type bp2BuildJavaInfo struct {
|
type bp2BuildJavaInfo struct {
|
||||||
// separates dependencies into dynamic dependencies and static dependencies.
|
// separates dependencies into dynamic dependencies and static dependencies.
|
||||||
DepLabels *javaDependencyLabels
|
DepLabels *javaDependencyLabels
|
||||||
hasKotlinSrcs bool
|
hasKotlin bool
|
||||||
}
|
}
|
||||||
|
|
||||||
// convertLibraryAttrsBp2Build returns a javaCommonAttributes struct with
|
// convertLibraryAttrsBp2Build returns a javaCommonAttributes struct with
|
||||||
@@ -2784,9 +2784,17 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.TopDownMutatorContext)
|
|||||||
depLabels.Deps = deps
|
depLabels.Deps = deps
|
||||||
depLabels.StaticDeps = bazel.MakeLabelListAttribute(staticDeps)
|
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{
|
bp2BuildInfo := &bp2BuildJavaInfo{
|
||||||
DepLabels: depLabels,
|
DepLabels: depLabels,
|
||||||
hasKotlinSrcs: !kotlinSrcs.IsEmpty(),
|
hasKotlin: hasKotlin,
|
||||||
}
|
}
|
||||||
|
|
||||||
return commonAttrs, bp2BuildInfo
|
return commonAttrs, bp2BuildInfo
|
||||||
@@ -2799,6 +2807,10 @@ type javaLibraryAttributes struct {
|
|||||||
Neverlink bazel.BoolAttribute
|
Neverlink bazel.BoolAttribute
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type kotlinAttributes struct {
|
||||||
|
Common_srcs bazel.LabelListAttribute
|
||||||
|
}
|
||||||
|
|
||||||
func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) {
|
func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) {
|
||||||
commonAttrs, bp2BuildInfo := m.convertLibraryAttrsBp2Build(ctx)
|
commonAttrs, bp2BuildInfo := m.convertLibraryAttrsBp2Build(ctx)
|
||||||
depLabels := bp2BuildInfo.DepLabels
|
depLabels := bp2BuildInfo.DepLabels
|
||||||
@@ -2827,14 +2839,12 @@ func javaLibraryBp2Build(ctx android.TopDownMutatorContext, m *Library) {
|
|||||||
}
|
}
|
||||||
name := m.Name()
|
name := m.Name()
|
||||||
|
|
||||||
if !bp2BuildInfo.hasKotlinSrcs && len(m.properties.Common_srcs) == 0 {
|
if !bp2BuildInfo.hasKotlin {
|
||||||
props = bazel.BazelTargetModuleProperties{
|
props = bazel.BazelTargetModuleProperties{
|
||||||
Rule_class: "java_library",
|
Rule_class: "java_library",
|
||||||
Bzl_load_location: "//build/bazel/rules/java:library.bzl",
|
Bzl_load_location: "//build/bazel/rules/java:library.bzl",
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
attrs.javaCommonAttributes.Common_srcs = bazel.MakeLabelListAttribute(android.BazelLabelForModuleSrc(ctx, m.properties.Common_srcs))
|
|
||||||
|
|
||||||
props = bazel.BazelTargetModuleProperties{
|
props = bazel.BazelTargetModuleProperties{
|
||||||
Rule_class: "kt_jvm_library",
|
Rule_class: "kt_jvm_library",
|
||||||
Bzl_load_location: "//build/bazel/rules/kotlin:kt_jvm_library.bzl",
|
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,
|
Jvm_flags: jvmFlags,
|
||||||
}
|
}
|
||||||
|
|
||||||
if !bp2BuildInfo.hasKotlinSrcs && len(m.properties.Common_srcs) == 0 {
|
if !bp2BuildInfo.hasKotlin {
|
||||||
attrs.javaCommonAttributes = commonAttrs
|
attrs.javaCommonAttributes = commonAttrs
|
||||||
attrs.Deps = deps
|
attrs.Deps = deps
|
||||||
} else {
|
} else {
|
||||||
@@ -2934,18 +2944,10 @@ func javaBinaryHostBp2Build(ctx android.TopDownMutatorContext, m *Binary) {
|
|||||||
Rule_class: "kt_jvm_library",
|
Rule_class: "kt_jvm_library",
|
||||||
Bzl_load_location: "//build/bazel/rules/kotlin:kt_jvm_library.bzl",
|
Bzl_load_location: "//build/bazel/rules/kotlin:kt_jvm_library.bzl",
|
||||||
}
|
}
|
||||||
|
|
||||||
ktAttrs := &javaLibraryAttributes{
|
ktAttrs := &javaLibraryAttributes{
|
||||||
Deps: deps,
|
Deps: deps,
|
||||||
javaCommonAttributes: &javaCommonAttributes{
|
javaCommonAttributes: commonAttrs,
|
||||||
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))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx.CreateBazelTargetModule(ktProps, android.CommonAttributes{Name: ktName}, ktAttrs)
|
ctx.CreateBazelTargetModule(ktProps, android.CommonAttributes{Name: ktName}, ktAttrs)
|
||||||
|
Reference in New Issue
Block a user