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

Create an intermediate java library for every java_binary target

Browse Source 
We're already doing this for kotlin libraries as java_binary does not
support kotlin sources.

Change-Id: I4967b3aca21dac8e0eaf54d48cc35d57a4c4923e
This commit is contained in:
Romain Jobredeaux
2023-03-16 11:00:36 -04:00
committed by Alix
parent 65e42ecd47
commit f5f6073ff5
2 changed files with 56 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
bp2build/java_binary_host_conversion_test.go
View File

@@ -56,11 +56,9 @@ func TestJavaBinaryHost(t *testing.T) {
java_version: "8",
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("java_binary", "java-binary-host-1", AttrNameToString{
"srcs": `["a.java"]`,
"main_class": `"com.android.test.MainClass"`,
"deps": `["//other:jni-lib-1"]`,
"jvm_flags": `["-Djava.library.path=$${RUNPATH}other"]`,
MakeBazelTarget("java_library", "java-binary-host-1_lib", AttrNameToString{
"srcs": `["a.java"]`,
"deps": `["//other:jni-lib-1"]`,
"javacopts": `[
"-Xdoclint:all/protected",
"-source 1.8 -target 1.8",
@@ -68,8 +66,15 @@ func TestJavaBinaryHost(t *testing.T) {
"target_compatible_with": `select({
"//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
"//conditions:default": [],
})`,
}),
})`}),
MakeBazelTarget("java_binary", "java-binary-host-1", AttrNameToString{
"main_class": `"com.android.test.MainClass"`,
"jvm_flags": `["-Djava.library.path=$${RUNPATH}other"]`,
"runtime_deps": `[":java-binary-host-1_lib"]`,
"target_compatible_with": `select({
"//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
"//conditions:default": [],
})`}),
},
})
}
@@ -122,15 +127,22 @@ java_import_host{
}
`,
ExpectedBazelTargets: []string{
MakeBazelTarget("java_binary", "java-binary-host-libs", AttrNameToString{
"main_class": `"com.android.test.MainClass"`,
"srcs": `["a.java"]`,
"deps": `[":java-lib-dep-1-neverlink"]`,
MakeBazelTarget("java_library", "java-binary-host-libs_lib", AttrNameToString{
"srcs": `["a.java"]`,
"deps": `[":java-lib-dep-1-neverlink"]`,
"target_compatible_with": `select({
"//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
"//conditions:default": [],
})`,
}),
MakeBazelTarget("java_binary", "java-binary-host-libs", AttrNameToString{
"main_class": `"com.android.test.MainClass"`,
"target_compatible_with": `select({
"//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
"//conditions:default": [],
})`,
"runtime_deps": `[":java-binary-host-libs_lib"]`,
}),
},
})
}
@@ -146,7 +158,7 @@ func TestJavaBinaryHostKotlinSrcs(t *testing.T) {
}
`,
ExpectedBazelTargets: []string{
MakeBazelTarget("kt_jvm_library", "java-binary-host_kt", AttrNameToString{
MakeBazelTarget("kt_jvm_library", "java-binary-host_lib", AttrNameToString{
"srcs": `[
"a.java",
"b.kt",
@@ -158,7 +170,7 @@ func TestJavaBinaryHostKotlinSrcs(t *testing.T) {
}),
MakeBazelTarget("java_binary", "java-binary-host", AttrNameToString{
"main_class": `"com.android.test.MainClass"`,
"runtime_deps": `[":java-binary-host_kt"]`,
"runtime_deps": `[":java-binary-host_lib"]`,
"target_compatible_with": `select({
"//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
"//conditions:default": [],
@@ -180,7 +192,7 @@ func TestJavaBinaryHostKotlinCommonSrcs(t *testing.T) {
}
`,
ExpectedBazelTargets: []string{
MakeBazelTarget("kt_jvm_library", "java-binary-host_kt", AttrNameToString{
MakeBazelTarget("kt_jvm_library", "java-binary-host_lib", AttrNameToString{
"srcs": `["a.java"]`,
"common_srcs": `["b.kt"]`,
"target_compatible_with": `select({
@@ -190,7 +202,7 @@ func TestJavaBinaryHostKotlinCommonSrcs(t *testing.T) {
}),
MakeBazelTarget("java_binary", "java-binary-host", AttrNameToString{
"main_class": `"com.android.test.MainClass"`,
"runtime_deps": `[":java-binary-host_kt"]`,
"runtime_deps": `[":java-binary-host_lib"]`,
"target_compatible_with": `select({
"//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
"//conditions:default": [],
@@ -216,7 +228,7 @@ func TestJavaBinaryHostKotlinWithResourceDir(t *testing.T) {
}
`,
ExpectedBazelTargets: []string{
MakeBazelTarget("kt_jvm_library", "java-binary-host_kt", AttrNameToString{
MakeBazelTarget("kt_jvm_library", "java-binary-host_lib", AttrNameToString{
"srcs": `[
"a.java",
"b.kt",
@@ -233,7 +245,7 @@ func TestJavaBinaryHostKotlinWithResourceDir(t *testing.T) {
}),
MakeBazelTarget("java_binary", "java-binary-host", AttrNameToString{
"main_class": `"com.android.test.MainClass"`,
"runtime_deps": `[":java-binary-host_kt"]`,
"runtime_deps": `[":java-binary-host_lib"]`,
"target_compatible_with": `select({
"//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
"//conditions:default": [],
@@ -259,7 +271,7 @@ func TestJavaBinaryHostKotlinWithResources(t *testing.T) {
}
`,
ExpectedBazelTargets: []string{
MakeBazelTarget("kt_jvm_library", "java-binary-host_kt", AttrNameToString{
MakeBazelTarget("kt_jvm_library", "java-binary-host_lib", AttrNameToString{
"srcs": `[
"a.java",
"b.kt",
@@ -275,7 +287,7 @@ func TestJavaBinaryHostKotlinWithResources(t *testing.T) {
}),
MakeBazelTarget("java_binary", "java-binary-host", AttrNameToString{
"main_class": `"com.android.test.MainClass"`,
"runtime_deps": `[":java-binary-host_kt"]`,
"runtime_deps": `[":java-binary-host_lib"]`,
"target_compatible_with": `select({
"//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
"//conditions:default": [],
@@ -297,7 +309,7 @@ func TestJavaBinaryHostKotlinCflags(t *testing.T) {
}
`,
ExpectedBazelTargets: []string{
MakeBazelTarget("kt_jvm_library", "java-binary-host_kt", AttrNameToString{
MakeBazelTarget("kt_jvm_library", "java-binary-host_lib", AttrNameToString{
"srcs": `["a.kt"]`,
"kotlincflags": `[
"-flag1",
@@ -310,7 +322,7 @@ func TestJavaBinaryHostKotlinCflags(t *testing.T) {
}),
MakeBazelTarget("java_binary", "java-binary-host", AttrNameToString{
"main_class": `"com.android.test.MainClass"`,
"runtime_deps": `[":java-binary-host_kt"]`,
"runtime_deps": `[":java-binary-host_lib"]`,
"target_compatible_with": `select({
"//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
"//conditions:default": [],

38
java/java.go
View File

@@ -2934,33 +2934,41 @@ func javaBinaryHostBp2Build(ctx android.TopDownMutatorContext, m *Binary) {
Rule_class: "java_binary",
Bzl_load_location: "//build/bazel/rules/java:rules.bzl",
}
attrs := &javaBinaryHostAttributes{
binAttrs := &javaBinaryHostAttributes{
Runtime_deps: runtimeDeps,
Main_class: mainClass,
Jvm_flags: jvmFlags,
}
if !bp2BuildInfo.hasKotlin {
attrs.javaCommonAttributes = commonAttrs
attrs.Deps = deps
} else {
ktName := m.Name() + "_kt"
ktProps := bazel.BazelTargetModuleProperties{
if commonAttrs.Srcs.IsEmpty() {
binAttrs.javaCommonAttributes = commonAttrs
ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: m.Name()}, binAttrs)
return
}
libName := m.Name() + "_lib"
var libProps bazel.BazelTargetModuleProperties
if bp2BuildInfo.hasKotlin {
libProps = bazel.BazelTargetModuleProperties{
Rule_class: "kt_jvm_library",
Bzl_load_location: "//build/bazel/rules/kotlin:rules.bzl",
}
ktAttrs := &javaLibraryAttributes{
Deps: deps,
javaCommonAttributes: commonAttrs,
} else {
libProps = bazel.BazelTargetModuleProperties{
Rule_class: "java_library",
Bzl_load_location: "//build/bazel/rules/java:rules.bzl",
}
ctx.CreateBazelTargetModule(ktProps, android.CommonAttributes{Name: ktName}, ktAttrs)
attrs.Runtime_deps.Add(&bazel.LabelAttribute{Value: &bazel.Label{Label: ":" + ktName}})
}
libAttrs := &javaLibraryAttributes{
Deps: deps,
javaCommonAttributes: commonAttrs,
}
ctx.CreateBazelTargetModule(libProps, android.CommonAttributes{Name: libName}, libAttrs)
binAttrs.Runtime_deps.Add(&bazel.LabelAttribute{Value: &bazel.Label{Label: ":" + libName}})
// Create the BazelTargetModule.
ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: m.Name()}, attrs)
ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: m.Name()}, binAttrs)
}
type bazelJavaImportAttributes struct {