diff options
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/java/java.go b/java/java.go index 574709169..6a764cfe9 100644 --- a/java/java.go +++ b/java/java.go @@ -2938,9 +2938,10 @@ func javaBinaryHostBp2Build(ctx android.TopDownMutatorContext, m *Binary) { ktAttrs := &javaLibraryAttributes{ Deps: deps, javaCommonAttributes: &javaCommonAttributes{ - Srcs: commonAttrs.Srcs, - Plugins: commonAttrs.Plugins, - Javacopts: commonAttrs.Javacopts, + Srcs: commonAttrs.Srcs, + Plugins: commonAttrs.Plugins, + Javacopts: commonAttrs.Javacopts, + javaResourcesAttributes: commonAttrs.javaResourcesAttributes, }, } @@ -2948,19 +2949,6 @@ func javaBinaryHostBp2Build(ctx android.TopDownMutatorContext, m *Binary) { 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 - } - } - ctx.CreateBazelTargetModule(ktProps, android.CommonAttributes{Name: ktName}, ktAttrs) attrs.Runtime_deps.Add(&bazel.LabelAttribute{Value: &bazel.Label{Label: ":" + ktName}}) } |