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

Merge changes from topic "ktResourceStrip" am: 09907dab55 am: 956e77d412 am: f0dcf6eec7

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

Change-Id: I95dc8e8f8c60dc8e0ef268b0f5a1385d46948a72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alix Espino
2023-03-07 20:44:05 +00:00
committed by Automerger Merge Worker
parent 33cbf2d461 f0dcf6eec7
commit b0b1af3b18
2 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bp2build/java_binary_host_conversion_test.go
View File

@@ -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": [],

20
java/java.go
View File

@@ -2937,9 +2937,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,
},
}
@@ -2947,19 +2948,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}})
}