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

Merge "Create an intermediate java library for every java_binary target" am: d3d2be2636 am: e9cee4bcf0

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

Change-Id: Ic2127af15ebb65de368fb84d09e1aae31fe4e0b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Romain Jobredeaux
2023-03-17 13:46:39 +00:00
committed by Automerger Merge Worker
parent 98661ab60b e9cee4bcf0
commit 2552659d92
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", java_version: "8",
}`, }`,
ExpectedBazelTargets: []string{ ExpectedBazelTargets: []string{
MakeBazelTarget("java_binary", "java-binary-host-1", AttrNameToString{ MakeBazelTarget("java_library", "java-binary-host-1_lib", AttrNameToString{
"srcs": `["a.java"]`, "srcs": `["a.java"]`,
"main_class": `"com.android.test.MainClass"`, "deps": `["//other:jni-lib-1"]`,
"deps": `["//other:jni-lib-1"]`,
"jvm_flags": `["-Djava.library.path=$${RUNPATH}other"]`,
"javacopts": `[ "javacopts": `[
"-Xdoclint:all/protected", "-Xdoclint:all/protected",
"-source 1.8 -target 1.8", "-source 1.8 -target 1.8",
@@ -68,8 +66,15 @@ func TestJavaBinaryHost(t *testing.T) {
"target_compatible_with": `select({ "target_compatible_with": `select({
"//build/bazel/platforms/os:android": ["@platforms//:incompatible"], "//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
"//conditions:default": [], "//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{ ExpectedBazelTargets: []string{
MakeBazelTarget("java_binary", "java-binary-host-libs", AttrNameToString{ MakeBazelTarget("java_library", "java-binary-host-libs_lib", AttrNameToString{
"main_class": `"com.android.test.MainClass"`, "srcs": `["a.java"]`,
"srcs": `["a.java"]`, "deps": `[":java-lib-dep-1-neverlink"]`,
"deps": `[":java-lib-dep-1-neverlink"]`,
"target_compatible_with": `select({ "target_compatible_with": `select({
"//build/bazel/platforms/os:android": ["@platforms//:incompatible"], "//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
"//conditions:default": [], "//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{ ExpectedBazelTargets: []string{
MakeBazelTarget("kt_jvm_library", "java-binary-host_kt", AttrNameToString{ MakeBazelTarget("kt_jvm_library", "java-binary-host_lib", AttrNameToString{
"srcs": `[ "srcs": `[
"a.java", "a.java",
"b.kt", "b.kt",
@@ -158,7 +170,7 @@ func TestJavaBinaryHostKotlinSrcs(t *testing.T) {
}), }),
MakeBazelTarget("java_binary", "java-binary-host", AttrNameToString{ MakeBazelTarget("java_binary", "java-binary-host", AttrNameToString{
"main_class": `"com.android.test.MainClass"`, "main_class": `"com.android.test.MainClass"`,
"runtime_deps": `[":java-binary-host_kt"]`, "runtime_deps": `[":java-binary-host_lib"]`,
"target_compatible_with": `select({ "target_compatible_with": `select({
"//build/bazel/platforms/os:android": ["@platforms//:incompatible"], "//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
"//conditions:default": [], "//conditions:default": [],
@@ -180,7 +192,7 @@ func TestJavaBinaryHostKotlinCommonSrcs(t *testing.T) {
} }
`, `,
ExpectedBazelTargets: []string{ ExpectedBazelTargets: []string{
MakeBazelTarget("kt_jvm_library", "java-binary-host_kt", AttrNameToString{ MakeBazelTarget("kt_jvm_library", "java-binary-host_lib", AttrNameToString{
"srcs": `["a.java"]`, "srcs": `["a.java"]`,
"common_srcs": `["b.kt"]`, "common_srcs": `["b.kt"]`,
"target_compatible_with": `select({ "target_compatible_with": `select({
@@ -190,7 +202,7 @@ func TestJavaBinaryHostKotlinCommonSrcs(t *testing.T) {
}), }),
MakeBazelTarget("java_binary", "java-binary-host", AttrNameToString{ MakeBazelTarget("java_binary", "java-binary-host", AttrNameToString{
"main_class": `"com.android.test.MainClass"`, "main_class": `"com.android.test.MainClass"`,
"runtime_deps": `[":java-binary-host_kt"]`, "runtime_deps": `[":java-binary-host_lib"]`,
"target_compatible_with": `select({ "target_compatible_with": `select({
"//build/bazel/platforms/os:android": ["@platforms//:incompatible"], "//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
"//conditions:default": [], "//conditions:default": [],
@@ -216,7 +228,7 @@ func TestJavaBinaryHostKotlinWithResourceDir(t *testing.T) {
} }
`, `,
ExpectedBazelTargets: []string{ ExpectedBazelTargets: []string{
MakeBazelTarget("kt_jvm_library", "java-binary-host_kt", AttrNameToString{ MakeBazelTarget("kt_jvm_library", "java-binary-host_lib", AttrNameToString{
"srcs": `[ "srcs": `[
"a.java", "a.java",
"b.kt", "b.kt",
@@ -233,7 +245,7 @@ func TestJavaBinaryHostKotlinWithResourceDir(t *testing.T) {
}), }),
MakeBazelTarget("java_binary", "java-binary-host", AttrNameToString{ MakeBazelTarget("java_binary", "java-binary-host", AttrNameToString{
"main_class": `"com.android.test.MainClass"`, "main_class": `"com.android.test.MainClass"`,
"runtime_deps": `[":java-binary-host_kt"]`, "runtime_deps": `[":java-binary-host_lib"]`,
"target_compatible_with": `select({ "target_compatible_with": `select({
"//build/bazel/platforms/os:android": ["@platforms//:incompatible"], "//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
"//conditions:default": [], "//conditions:default": [],
@@ -259,7 +271,7 @@ func TestJavaBinaryHostKotlinWithResources(t *testing.T) {
} }
`, `,
ExpectedBazelTargets: []string{ ExpectedBazelTargets: []string{
MakeBazelTarget("kt_jvm_library", "java-binary-host_kt", AttrNameToString{ MakeBazelTarget("kt_jvm_library", "java-binary-host_lib", AttrNameToString{
"srcs": `[ "srcs": `[
"a.java", "a.java",
"b.kt", "b.kt",
@@ -275,7 +287,7 @@ func TestJavaBinaryHostKotlinWithResources(t *testing.T) {
}), }),
MakeBazelTarget("java_binary", "java-binary-host", AttrNameToString{ MakeBazelTarget("java_binary", "java-binary-host", AttrNameToString{
"main_class": `"com.android.test.MainClass"`, "main_class": `"com.android.test.MainClass"`,
"runtime_deps": `[":java-binary-host_kt"]`, "runtime_deps": `[":java-binary-host_lib"]`,
"target_compatible_with": `select({ "target_compatible_with": `select({
"//build/bazel/platforms/os:android": ["@platforms//:incompatible"], "//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
"//conditions:default": [], "//conditions:default": [],
@@ -297,7 +309,7 @@ func TestJavaBinaryHostKotlinCflags(t *testing.T) {
} }
`, `,
ExpectedBazelTargets: []string{ ExpectedBazelTargets: []string{
MakeBazelTarget("kt_jvm_library", "java-binary-host_kt", AttrNameToString{ MakeBazelTarget("kt_jvm_library", "java-binary-host_lib", AttrNameToString{
"srcs": `["a.kt"]`, "srcs": `["a.kt"]`,
"kotlincflags": `[ "kotlincflags": `[
"-flag1", "-flag1",
@@ -310,7 +322,7 @@ func TestJavaBinaryHostKotlinCflags(t *testing.T) {
}), }),
MakeBazelTarget("java_binary", "java-binary-host", AttrNameToString{ MakeBazelTarget("java_binary", "java-binary-host", AttrNameToString{
"main_class": `"com.android.test.MainClass"`, "main_class": `"com.android.test.MainClass"`,
"runtime_deps": `[":java-binary-host_kt"]`, "runtime_deps": `[":java-binary-host_lib"]`,
"target_compatible_with": `select({ "target_compatible_with": `select({
"//build/bazel/platforms/os:android": ["@platforms//:incompatible"], "//build/bazel/platforms/os:android": ["@platforms//:incompatible"],
"//conditions:default": [], "//conditions:default": [],

38
java/java.go
View File

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