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

Revert "Don't use java_library for java_import neverlink"

Browse Source 
Revert submission 2786699-import-sdk-version-none

Reason for revert: b/306220520

Reverted changes: /q/submissionid:2786699-import-sdk-version-none

Change-Id: I4fbe5fa54dc11fac898a7f15704833f01b9fa269
This commit is contained in:
Liz Kammer
2023-10-18 20:38:37 +00:00
parent 05f487a4cd
commit e11182283f
2 changed files with 36 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
bp2build/java_import_conversion_test.go
View File

@@ -52,15 +52,13 @@ java_import {
}
`,
ExpectedBazelTargets: []string{
MakeBazelTarget("filegroup", "example_import-jars", AttrNameToString{
"srcs": `["import.jar"]`,
}),
MakeBazelTarget("java_import", "example_import", AttrNameToString{
"jars": `[":example_import-jars"]`,
"jars": `["import.jar"]`,
}),
MakeBazelTarget("java_import", "example_import-neverlink", AttrNameToString{
"jars": `[":example_import-jars"]`,
"neverlink": `True`,
MakeBazelTarget("java_library", "example_import-neverlink", AttrNameToString{
"exports": `[":example_import"]`,
"neverlink": `True`,
"sdk_version": `"none"`,
}),
}})
}
@@ -88,19 +86,17 @@ java_import {
}
`,
ExpectedBazelTargets: []string{
MakeBazelTarget("filegroup", "example_import-jars", AttrNameToString{
"srcs": `select({
MakeBazelTarget("java_import", "example_import", AttrNameToString{
"jars": `select({
"//build/bazel_common_rules/platforms/os:android": ["android.jar"],
"//build/bazel_common_rules/platforms/os:linux_glibc": ["linux.jar"],
"//conditions:default": [],
})`,
}),
MakeBazelTarget("java_import", "example_import", AttrNameToString{
"jars": `[":example_import-jars"]`,
}),
MakeBazelTarget("java_import", "example_import-neverlink", AttrNameToString{
"jars": `[":example_import-jars"]`,
"neverlink": `True`,
MakeBazelTarget("java_library", "example_import-neverlink", AttrNameToString{
"exports": `[":example_import"]`,
"neverlink": `True`,
"sdk_version": `"none"`,
}),
}})
}
@@ -121,15 +117,13 @@ java_import_host {
}
`,
ExpectedBazelTargets: []string{
MakeBazelTarget("filegroup", "example_import-jars", AttrNameToString{
"srcs": `["import.jar"]`,
}),
MakeBazelTarget("java_import", "example_import", AttrNameToString{
"jars": `[":example_import-jars"]`,
"jars": `["import.jar"]`,
}),
MakeBazelTarget("java_import", "example_import-neverlink", AttrNameToString{
"jars": `[":example_import-jars"]`,
"neverlink": `True`,
MakeBazelTarget("java_library", "example_import-neverlink", AttrNameToString{
"exports": `[":example_import"]`,
"neverlink": `True`,
"sdk_version": `"none"`,
}),
}})
}
@@ -148,15 +142,13 @@ func TestJavaImportSameNameAsJavaLibrary(t *testing.T) {
}
`,
ExpectedBazelTargets: []string{
MakeBazelTarget("filegroup", "test_lib-jars", AttrNameToString{
"srcs": `["test.jar"]`,
}),
MakeBazelTarget("java_import", "test_lib", AttrNameToString{
"jars": `[":test_lib-jars"]`,
"jars": `["test.jar"]`,
}),
MakeBazelTarget("java_import", "test_lib-neverlink", AttrNameToString{
"jars": `[":test_lib-jars"]`,
"neverlink": `True`,
MakeBazelTarget("java_library", "test_lib-neverlink", AttrNameToString{
"exports": `[":test_lib"]`,
"neverlink": `True`,
"sdk_version": `"none"`,
}),
},
}, func(ctx android.RegistrationContext) {