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

Handle java_resources as deps

Browse Source 
Test: CI && unit tests
Change-Id: I51f3c7d876c3cc25cb0459d933e1a510cfb5bf13
This commit is contained in:
Liz Kammer
2023-10-09 14:07:46 -04:00
parent 9f52f6ba60
commit 93b7e9545e
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bp2build/java_library_conversion_test.go
View File

@@ -463,6 +463,7 @@ func TestJavaLibraryResourcesWithMultipleDirs(t *testing.T) {
}, },
Blueprint: `java_library { Blueprint: `java_library {
name: "java-lib-1", name: "java-lib-1",
srcs: ["foo.java"],
java_resource_dirs: ["res", "res1"], java_resource_dirs: ["res", "res1"],
sdk_version: "current", sdk_version: "current",
}`, }`,
@@ -472,9 +473,10 @@ func TestJavaLibraryResourcesWithMultipleDirs(t *testing.T) {
"resources": `["res1/b.res"]`, "resources": `["res1/b.res"]`,
}), }),
MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{ MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{
"additional_resources": `["java-lib-1_resource_dir_res1"]`, "deps": `["java-lib-1_resource_dir_res1"]`,
"resources": `["res/a.res"]`, "resources": `["res/a.res"]`,
"resource_strip_prefix": `"res"`, "resource_strip_prefix": `"res"`,
"srcs": `["foo.java"]`,
"sdk_version": `"current"`, "sdk_version": `"current"`,
}), }),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"), MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
@@ -492,6 +494,7 @@ func TestJavaLibraryJavaResourcesAndResourceDirs(t *testing.T) {
java_resources: ["res1", "res2"], java_resources: ["res1", "res2"],
java_resource_dirs: ["resdir"], java_resource_dirs: ["resdir"],
sdk_version: "current", sdk_version: "current",
srcs: ["foo.java"],
}`, }`,
ExpectedBazelTargets: []string{ ExpectedBazelTargets: []string{
MakeBazelTarget("java_resources", "java-lib-1_resource_dir_resdir", AttrNameToString{ MakeBazelTarget("java_resources", "java-lib-1_resource_dir_resdir", AttrNameToString{
@@ -499,12 +502,13 @@ func TestJavaLibraryJavaResourcesAndResourceDirs(t *testing.T) {
"resources": `["resdir/a.res"]`, "resources": `["resdir/a.res"]`,
}), }),
MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{ MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{
"additional_resources": `["java-lib-1_resource_dir_resdir"]`, "deps": `["java-lib-1_resource_dir_resdir"]`,
"resource_strip_prefix": `"."`, "resource_strip_prefix": `"."`,
"resources": `[ "resources": `[
"res1", "res1",
"res2", "res2",
]`, ]`,
"srcs": `["foo.java"]`,
"sdk_version": `"current"`, "sdk_version": `"current"`,
}), }),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"), MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
@@ -1064,7 +1068,7 @@ filegroup {
"srcs": `["a.java"]`, "srcs": `["a.java"]`,
"resources": `["a.res"]`, "resources": `["a.res"]`,
"resource_strip_prefix": `"."`, "resource_strip_prefix": `"."`,
"additional_resources": `[ "deps": `[
"java-lib-1_filegroup_resources_filegroup1", "java-lib-1_filegroup_resources_filegroup1",
"java-lib-1_filegroup_resources_filegroup2", "java-lib-1_filegroup_resources_filegroup2",
]`, ]`,

7
java/java.go
View File

@@ -2775,7 +2775,7 @@ func addCLCFromDep(ctx android.ModuleContext, depModule android.Module,
type javaResourcesAttributes struct { type javaResourcesAttributes struct {
Resources bazel.LabelListAttribute Resources bazel.LabelListAttribute
Resource_strip_prefix *string Resource_strip_prefix *string
Additional_resources bazel.LabelListAttribute Additional_resources bazel.LabelListAttribute `blueprint:"mutated"`
} }
func (m *Library) getResourceFilegroupStripPrefix(ctx android.Bp2buildMutatorContext, resourceFilegroup string) (*string, bool) { func (m *Library) getResourceFilegroupStripPrefix(ctx android.Bp2buildMutatorContext, resourceFilegroup string) (*string, bool) {
@@ -3052,9 +3052,11 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.Bp2buildMutatorContext
javacopts.Append(bazel.MakeStringListAttribute([]string{"-XepDisableAllChecks"})) javacopts.Append(bazel.MakeStringListAttribute([]string{"-XepDisableAllChecks"}))
} }
resourcesAttrs := m.convertJavaResourcesAttributes(ctx)
commonAttrs := &javaCommonAttributes{ commonAttrs := &javaCommonAttributes{
Srcs: javaSrcs, Srcs: javaSrcs,
javaResourcesAttributes: m.convertJavaResourcesAttributes(ctx), javaResourcesAttributes: resourcesAttrs,
Plugins: plugins, Plugins: plugins,
Javacopts: javacopts, Javacopts: javacopts,
Java_version: bazel.StringAttribute{Value: m.properties.Java_version}, Java_version: bazel.StringAttribute{Value: m.properties.Java_version},
@@ -3077,6 +3079,7 @@ func (m *Library) convertLibraryAttrsBp2Build(ctx android.Bp2buildMutatorContext
} }
depLabels := &javaDependencyLabels{} depLabels := &javaDependencyLabels{}
deps.Append(resourcesAttrs.Additional_resources)
depLabels.Deps = deps depLabels.Deps = deps
for axis, configToProps := range archVariantProps { for axis, configToProps := range archVariantProps {