Add do not convert for sdk_version unset
When sdk_version is unset, the build with fail with Bazel because
private APIs are do not build with Bazel at this time.
This instead prevents migrating the relevant target to Bazel in bp2build
Test: go tests
Change-Id: I31dabcf143de7933706d1b734ef21467a01b65e9
diff --git a/bp2build/java_library_conversion_test.go b/bp2build/java_library_conversion_test.go
index 5c769a5..7429ae6 100644
--- a/bp2build/java_library_conversion_test.go
+++ b/bp2build/java_library_conversion_test.go
@@ -42,22 +42,26 @@
srcs: ["a.java", "b.java"],
exclude_srcs: ["b.java"],
libs: ["java-lib-2"],
+ sdk_version: "current",
bazel_module: { bp2build_available: true },
}
java_library {
name: "java-lib-2",
srcs: ["b.java"],
+ sdk_version: "current",
bazel_module: { bp2build_available: true },
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{
- "srcs": `["a.java"]`,
- "deps": `[":java-lib-2-neverlink"]`,
+ "srcs": `["a.java"]`,
+ "deps": `[":java-lib-2-neverlink"]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
MakeBazelTarget("java_library", "java-lib-2", AttrNameToString{
- "srcs": `["b.java"]`,
+ "srcs": `["b.java"]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-2"),
},
@@ -71,18 +75,21 @@
srcs: ["a.java"],
libs: ["java-lib-2"],
static_libs: ["java-lib-3"],
+ sdk_version: "current",
bazel_module: { bp2build_available: true },
}
java_library {
name: "java-lib-2",
srcs: ["b.java"],
+ sdk_version: "current",
bazel_module: { bp2build_available: false },
}
java_library {
name: "java-lib-3",
srcs: ["c.java"],
+ sdk_version: "current",
bazel_module: { bp2build_available: false },
}`,
ExpectedBazelTargets: []string{
@@ -92,7 +99,8 @@
":java-lib-2-neverlink",
":java-lib-3",
]`,
- "exports": `[":java-lib-3"]`,
+ "exports": `[":java-lib-3"]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
},
@@ -104,6 +112,7 @@
Blueprint: `java_library {
name: "java-lib-1",
static_libs: ["java-lib-2"],
+ sdk_version: "current",
bazel_module: { bp2build_available: true },
}
@@ -114,25 +123,40 @@
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{
- "exports": `[":java-lib-2"]`,
+ "exports": `[":java-lib-2"]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
},
})
}
+func TestJavaLibraryFailsToConvertNoSdkVersion(t *testing.T) {
+ runJavaLibraryTestCase(t, Bp2buildTestCase{
+ Blueprint: `
+java_library {
+ name: "lib",
+ bazel_module: { bp2build_available: true },
+}
+`,
+ ExpectedBazelTargets: []string{}, // no targets expected because sdk_version is not set
+ })
+}
+
func TestJavaLibraryFailsToConvertLibsWithNoSrcs(t *testing.T) {
runJavaLibraryTestCase(t, Bp2buildTestCase{
ExpectedErr: fmt.Errorf("Module has direct dependencies but no sources. Bazel will not allow this."),
Blueprint: `java_library {
name: "java-lib-1",
libs: ["java-lib-2"],
+ sdk_version: "current",
bazel_module: { bp2build_available: true },
}
java_library {
name: "java-lib-2",
srcs: ["a.java"],
+ sdk_version: "current",
bazel_module: { bp2build_available: false },
}`,
ExpectedBazelTargets: []string{},
@@ -144,6 +168,7 @@
Blueprint: `java_library {
name: "java-lib-1",
plugins: ["java-plugin-1"],
+ sdk_version: "current",
bazel_module: { bp2build_available: true },
}
@@ -154,7 +179,8 @@
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{
- "plugins": `[":java-plugin-1"]`,
+ "plugins": `[":java-plugin-1"]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
},
@@ -169,16 +195,21 @@
name: "java-lib-1",
srcs: ["a.java"],
java_version: "11",
+ sdk_version: "current",
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{
"srcs": `["a.java"]`,
"java_version": `"11"`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTargetWithAttrs(
"java_library",
"java-lib-1",
- AttrNameToString{"java_version": `"11"`}),
+ AttrNameToString{
+ "java_version": `"11"`,
+ "sdk_version": `"current"`,
+ }),
},
})
}
@@ -189,6 +220,7 @@
name: "java-lib-1",
srcs: ["a.java"],
javacflags: ["-Xsuper-fast"],
+ sdk_version: "current",
errorprone: {
enabled: true,
javacflags: ["-Xep:SpeedLimit:OFF"],
@@ -209,6 +241,7 @@
"plugins": `[":plugin2"]`,
"srcs": `["a.java"]`,
"errorprone_force_enable": `True`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
},
@@ -222,6 +255,7 @@
Blueprint: `java_library {
name: "java-lib-1",
srcs: ["a.java"],
+ sdk_version: "current",
javacflags: ["-Xsuper-fast"],
errorprone: {
javacflags: ["-Xep:SpeedLimit:OFF"],
@@ -229,8 +263,9 @@
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{
- "javacopts": `["-Xsuper-fast"]`,
- "srcs": `["a.java"]`,
+ "javacopts": `["-Xsuper-fast"]`,
+ "srcs": `["a.java"]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
},
@@ -243,6 +278,7 @@
name: "java-lib-1",
srcs: ["a.java"],
javacflags: ["-Xsuper-fast"],
+ sdk_version: "current",
errorprone: {
enabled: false,
},
@@ -253,7 +289,8 @@
"-Xsuper-fast",
"-XepDisableAllChecks",
]`,
- "srcs": `["a.java"]`,
+ "srcs": `["a.java"]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
},
@@ -266,14 +303,15 @@
ModuleTypeUnderTest: "java_library",
ModuleTypeUnderTestFactory: java.LibraryFactory,
Blueprint: `java_library {
- name: "example_lib",
- srcs: [
- "a.java",
- "b.java",
- "a.logtag",
- "b.logtag",
- ],
- bazel_module: { bp2build_available: true },
+ name: "example_lib",
+ srcs: [
+ "a.java",
+ "b.java",
+ "a.logtag",
+ "b.logtag",
+ ],
+ sdk_version: "current",
+ bazel_module: { bp2build_available: true },
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("event_log_tags", "example_lib_logtags", AttrNameToString{
@@ -288,6 +326,7 @@
"b.java",
":example_lib_logtags",
]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "example_lib"),
}})
@@ -301,9 +340,10 @@
"adir/res/b.res": "",
"adir/res/dir1/b.res": "",
"adir/Android.bp": `java_library {
- name: "java-lib-1",
- java_resources: ["res/a.res", "res/b.res"],
- bazel_module: { bp2build_available: true },
+ name: "java-lib-1",
+ java_resources: ["res/a.res", "res/b.res"],
+ sdk_version: "current",
+ bazel_module: { bp2build_available: true },
}`,
},
Blueprint: "",
@@ -314,6 +354,7 @@
"res/b.res",
]`,
"resource_strip_prefix": `"adir"`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
},
@@ -328,8 +369,9 @@
"res/dir1/b.res": "",
},
Blueprint: `java_library {
- name: "java-lib-1",
+ name: "java-lib-1",
java_resource_dirs: ["res"],
+ sdk_version: "current",
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{
@@ -339,6 +381,7 @@
"res/b.res",
"res/dir1/b.res",
]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
},
@@ -352,14 +395,16 @@
"res/exclude/b.res": "",
},
Blueprint: `java_library {
- name: "java-lib-1",
+ name: "java-lib-1",
java_resource_dirs: ["res"],
+ sdk_version: "current",
exclude_java_resource_dirs: ["res/exclude"],
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("java_library", "java-lib-1", AttrNameToString{
"resource_strip_prefix": `"res"`,
"resources": `["res/a.res"]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
},
@@ -374,8 +419,9 @@
"res/dir1/exclude.res": "",
},
Blueprint: `java_library {
- name: "java-lib-1",
+ name: "java-lib-1",
java_resource_dirs: ["res"],
+ sdk_version: "current",
exclude_java_resources: ["res/dir1/exclude.res"],
}`,
ExpectedBazelTargets: []string{
@@ -385,6 +431,7 @@
"res/a.res",
"res/dir1/b.res",
]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
},
@@ -398,8 +445,9 @@
"res1/b.res": "",
},
Blueprint: `java_library {
- name: "java-lib-1",
+ name: "java-lib-1",
java_resource_dirs: ["res", "res1"],
+ sdk_version: "current",
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("java_resources", "java-lib-1_resource_dir_res1", AttrNameToString{
@@ -410,6 +458,7 @@
"additional_resources": `["java-lib-1_resource_dir_res1"]`,
"resources": `["res/a.res"]`,
"resource_strip_prefix": `"res"`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
},
@@ -422,9 +471,10 @@
"resdir/a.res": "",
},
Blueprint: `java_library {
- name: "java-lib-1",
- java_resources: ["res1", "res2"],
- java_resource_dirs: ["resdir"],
+ name: "java-lib-1",
+ java_resources: ["res1", "res2"],
+ java_resource_dirs: ["resdir"],
+ sdk_version: "current",
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("java_resources", "java-lib-1_resource_dir_resdir", AttrNameToString{
@@ -438,6 +488,7 @@
"res1",
"res2",
]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
},
@@ -450,14 +501,15 @@
ModuleTypeUnderTest: "java_library",
ModuleTypeUnderTestFactory: java.LibraryFactory,
Blueprint: `java_library {
- name: "example_lib",
- srcs: [
- "a.java",
- "b.java",
- "a.aidl",
- "b.aidl",
- ],
- bazel_module: { bp2build_available: true },
+ name: "example_lib",
+ srcs: [
+ "a.java",
+ "b.java",
+ "a.aidl",
+ "b.aidl",
+ ],
+ bazel_module: { bp2build_available: true },
+ sdk_version: "current",
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("aidl_library", "example_lib_aidl_library", AttrNameToString{
@@ -476,6 +528,7 @@
"a.java",
"b.java",
]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "example_lib"),
}})
@@ -488,12 +541,13 @@
ModuleTypeUnderTestFactory: java.LibraryFactory,
Blueprint: `
java_library {
- name: "example_lib",
- srcs: [
- "a.java",
- "b.aidl",
- ],
- bazel_module: { bp2build_available: true },
+ name: "example_lib",
+ srcs: [
+ "a.java",
+ "b.aidl",
+ ],
+ sdk_version: "current",
+ bazel_module: { bp2build_available: true },
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("aidl_library", "example_lib_aidl_library", AttrNameToString{
@@ -503,9 +557,10 @@
"deps": `[":example_lib_aidl_library"]`,
}),
MakeBazelTarget("java_library", "example_lib", AttrNameToString{
- "deps": `[":example_lib_java_aidl_library"]`,
- "exports": `[":example_lib_java_aidl_library"]`,
- "srcs": `["a.java"]`,
+ "deps": `[":example_lib_java_aidl_library"]`,
+ "exports": `[":example_lib_java_aidl_library"]`,
+ "srcs": `["a.java"]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "example_lib"),
},
@@ -535,14 +590,15 @@
],
}
java_library {
- name: "example_lib",
- srcs: [
- "a.java",
- "b.java",
- ":aidl_files",
- ":random_other_files",
- ],
- bazel_module: { bp2build_available: true },
+ name: "example_lib",
+ srcs: [
+ "a.java",
+ "b.java",
+ ":aidl_files",
+ ":random_other_files",
+ ],
+ sdk_version: "current",
+ bazel_module: { bp2build_available: true },
}`,
ExpectedBazelTargets: []string{
MakeBazelTargetNoRestrictions("aidl_library", "aidl_files", AttrNameToString{
@@ -563,6 +619,7 @@
"b.java",
":random_other_files",
]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "example_lib"),
MakeBazelTargetNoRestrictions("filegroup", "random_other_files", AttrNameToString{
@@ -585,24 +642,26 @@
Filesystem: map[string]string{
"path/to/A/Android.bp": `
filegroup {
- name: "A_aidl",
- srcs: ["aidl/A.aidl"],
- path: "aidl",
+ name: "A_aidl",
+ srcs: ["aidl/A.aidl"],
+ path: "aidl",
}`,
},
Blueprint: `
java_library {
- name: "foo",
- srcs: [
- ":A_aidl",
- ],
+ name: "foo",
+ srcs: [
+ ":A_aidl",
+ ],
+ sdk_version: "current",
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("java_aidl_library", "foo_java_aidl_library", AttrNameToString{
"deps": `["//path/to/A:A_aidl"]`,
}),
MakeBazelTarget("java_library", "foo", AttrNameToString{
- "exports": `[":foo_java_aidl_library"]`,
+ "exports": `[":foo_java_aidl_library"]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "foo"),
},
@@ -619,16 +678,17 @@
ModuleTypeUnderTestFactory: java.AndroidLibraryFactory,
Blueprint: simpleModuleDoNotConvertBp2build("android_library", "static_lib_dep") + `
android_library {
- name: "TestLib",
- manifest: "manifest/AndroidManifest.xml",
- srcs: ["lib.java"],
- arch: {
- arm: {
- neon: {
- srcs: ["arm_neon.java"],
- },
- },
- },
+ name: "TestLib",
+ manifest: "manifest/AndroidManifest.xml",
+ srcs: ["lib.java"],
+ sdk_version: "current",
+ arch: {
+ arm: {
+ neon: {
+ srcs: ["arm_neon.java"],
+ },
+ },
+ },
}
`,
ExpectedBazelTargets: []string{
@@ -642,6 +702,7 @@
})`,
"manifest": `"manifest/AndroidManifest.xml"`,
"resource_files": `[]`,
+ "sdk_version": `"current"`, // use as default
}),
MakeNeverlinkDuplicateTarget("android_library", "TestLib"),
}})
@@ -655,19 +716,20 @@
ModuleTypeUnderTestFactory: java.AndroidLibraryFactory,
Blueprint: simpleModuleDoNotConvertBp2build("android_library", "static_lib_dep") + `
android_library {
- name: "TestLib",
- manifest: "manifest/AndroidManifest.xml",
- srcs: ["lib.java"],
- arch: {
- x86: {
- ssse3: {
- srcs: ["ssse3.java"],
- },
- sse4_1: {
- srcs: ["sse4_1.java"],
- },
- },
- },
+ name: "TestLib",
+ manifest: "manifest/AndroidManifest.xml",
+ srcs: ["lib.java"],
+ sdk_version: "current",
+ arch: {
+ x86: {
+ ssse3: {
+ srcs: ["ssse3.java"],
+ },
+ sse4_1: {
+ srcs: ["sse4_1.java"],
+ },
+ },
+ },
}
`,
ExpectedBazelTargets: []string{
@@ -686,6 +748,7 @@
})`,
"manifest": `"manifest/AndroidManifest.xml"`,
"resource_files": `[]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("android_library", "TestLib"),
}})
@@ -699,17 +762,18 @@
ModuleTypeUnderTestFactory: java.AndroidLibraryFactory,
Blueprint: simpleModuleDoNotConvertBp2build("android_library", "static_lib_dep") + `
android_library {
- name: "TestLib",
- manifest: "manifest/AndroidManifest.xml",
- srcs: ["lib.java"],
- arch: {
- arm: {
- srcs: ["arm_non_neon.java"],
- neon: {
- exclude_srcs: ["arm_non_neon.java"],
- },
- },
- },
+ name: "TestLib",
+ manifest: "manifest/AndroidManifest.xml",
+ srcs: ["lib.java"],
+ arch: {
+ arm: {
+ srcs: ["arm_non_neon.java"],
+ neon: {
+ exclude_srcs: ["arm_non_neon.java"],
+ },
+ },
+ },
+ sdk_version: "current",
}
`,
ExpectedBazelTargets: []string{
@@ -724,6 +788,7 @@
})`,
"manifest": `"manifest/AndroidManifest.xml"`,
"resource_files": `[]`,
+ "sdk_version": `"current"`, // use as default
}),
MakeNeverlinkDuplicateTarget("android_library", "TestLib"),
}})
@@ -736,6 +801,7 @@
name: "java-lib-1",
srcs: ["a.java", "b.java", "c.kt"],
bazel_module: { bp2build_available: true },
+ sdk_version: "current",
}
`,
ExpectedBazelTargets: []string{
@@ -745,6 +811,7 @@
"b.java",
"c.kt",
]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("kt_jvm_library", "java-lib-1"),
},
@@ -759,6 +826,7 @@
srcs: [ "a.kt"],
kotlincflags: ["-flag1", "-flag2"],
bazel_module: { bp2build_available: true },
+ sdk_version: "current",
}
`,
ExpectedBazelTargets: []string{
@@ -768,6 +836,7 @@
"-flag1",
"-flag2",
]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("kt_jvm_library", "java-lib-1"),
},
@@ -782,6 +851,7 @@
srcs: ["a.java", "b.java"],
common_srcs: ["c.kt"],
bazel_module: { bp2build_available: true },
+ sdk_version: "current",
}
`,
ExpectedBazelTargets: []string{
@@ -791,6 +861,7 @@
"b.java",
]`,
"common_srcs": `["c.kt"]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("kt_jvm_library", "java-lib-1"),
},
@@ -804,6 +875,7 @@
name: "java-lib-1",
srcs: ["a.java"],
libs: ["java-lib-2"],
+ sdk_version: "current",
target: {
android: {
libs: ["java-lib-3"],
@@ -813,16 +885,19 @@
bazel_module: { bp2build_available: true },
}
- java_library{
- name: "java-lib-2",
+ java_library{
+ name: "java-lib-2",
+ bazel_module: { bp2build_available: false },
}
- java_library{
- name: "java-lib-3",
+ java_library{
+ name: "java-lib-3",
+ bazel_module: { bp2build_available: false },
}
- java_library{
- name: "java-lib-4",
+ java_library{
+ name: "java-lib-4",
+ bazel_module: { bp2build_available: false },
}
`,
ExpectedBazelTargets: []string{
@@ -839,14 +914,9 @@
],
"//conditions:default": [],
})`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
- MakeBazelTarget("java_library", "java-lib-2", AttrNameToString{}),
- MakeNeverlinkDuplicateTarget("java_library", "java-lib-2"),
- MakeBazelTarget("java_library", "java-lib-3", AttrNameToString{}),
- MakeNeverlinkDuplicateTarget("java_library", "java-lib-3"),
- MakeBazelTarget("java_library", "java-lib-4", AttrNameToString{}),
- MakeNeverlinkDuplicateTarget("java_library", "java-lib-4"),
},
})
}
@@ -857,6 +927,7 @@
Blueprint: `java_library {
name: "java-lib-1",
srcs: ["a.java", "b.java"],
+ sdk_version: "current",
target: {
android: {
exclude_srcs: ["a.java"],
@@ -871,6 +942,7 @@
"//build/bazel/platforms/os:android": [],
"//conditions:default": ["a.java"],
})`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
},
@@ -888,6 +960,7 @@
Blueprint: `java_library {
name: "java-lib-1",
srcs: ["a.java"],
+ sdk_version: "current",
java_resources: [":filegroup1"],
bazel_module: { bp2build_available: true },
}
@@ -904,6 +977,7 @@
"srcs": `["a.java"]`,
"resources": `[":filegroup1"]`,
"resource_strip_prefix": `"foo"`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
MakeBazelTargetNoRestrictions("filegroup", "filegroup1", AttrNameToString{
@@ -927,6 +1001,7 @@
name: "java-lib-1",
srcs: ["a.java"],
java_resources: ["a.res", ":filegroup1", ":filegroup2"],
+ sdk_version: "current",
bazel_module: { bp2build_available: true },
}
@@ -959,6 +1034,7 @@
"java-lib-1_filegroup_resources_filegroup1",
"java-lib-1_filegroup_resources_filegroup2",
]`,
+ "sdk_version": `"current"`,
}),
MakeNeverlinkDuplicateTarget("java_library", "java-lib-1"),
MakeBazelTargetNoRestrictions("filegroup", "filegroup1", AttrNameToString{