diff options
| -rw-r--r-- | bp2build/java_binary_host_conversion_test.go | 10 | ||||
| -rw-r--r-- | java/java.go | 20 |
2 files changed, 9 insertions, 21 deletions
diff --git a/bp2build/java_binary_host_conversion_test.go b/bp2build/java_binary_host_conversion_test.go index 46105c72b..6f17e346f 100644 --- a/bp2build/java_binary_host_conversion_test.go +++ b/bp2build/java_binary_host_conversion_test.go @@ -221,6 +221,11 @@ func TestJavaBinaryHostKotlinWithResourceDir(t *testing.T) { "a.java", "b.kt", ]`, + "resources": `[ + "res/a.res", + "res/dir1/b.res", + ]`, + "resource_strip_prefix": `"res"`, "target_compatible_with": `select({ "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], @@ -229,11 +234,6 @@ func TestJavaBinaryHostKotlinWithResourceDir(t *testing.T) { MakeBazelTarget("java_binary", "java-binary-host", AttrNameToString{ "main_class": `"com.android.test.MainClass"`, "runtime_deps": `[":java-binary-host_kt"]`, - "resources": `[ - "res/a.res", - "res/dir1/b.res", - ]`, - "resource_strip_prefix": `"res"`, "target_compatible_with": `select({ "//build/bazel/platforms/os:android": ["@platforms//:incompatible"], "//conditions:default": [], 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}}) } |