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

apex bp2build: refactor module names to be more meaningful.

Browse Source 
Numbered module names weren't obvious.

Test: presubmits
Change-Id: Iee921e2965d1664ed1bccd934ab80f913eff6356
This commit is contained in:
Jingwen Chen
2022-10-06 13:02:30 +00:00
parent 51ad4cbf09
commit 34feb1471a
1 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
bp2build/apex_conversion_test.go
View File

@@ -277,23 +277,23 @@ filegroup {
ExpectedBazelTargets: []string{ ExpectedBazelTargets: []string{
MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{ MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{
"native_shared_libs_32": `[ "native_shared_libs_32": `[
":native_shared_lib_1", ":native_shared_lib_for_both",
":native_shared_lib_3", ":native_shared_lib_for_lib32",
] + select({ ] + select({
"//build/bazel/platforms/arch:arm": [":native_shared_lib_2"], "//build/bazel/platforms/arch:arm": [":native_shared_lib_for_first"],
"//build/bazel/platforms/arch:x86": [":native_shared_lib_2"], "//build/bazel/platforms/arch:x86": [":native_shared_lib_for_first"],
"//conditions:default": [], "//conditions:default": [],
})`, })`,
"native_shared_libs_64": `select({ "native_shared_libs_64": `select({
"//build/bazel/platforms/arch:arm64": [ "//build/bazel/platforms/arch:arm64": [
":native_shared_lib_1", ":native_shared_lib_for_both",
":native_shared_lib_4", ":native_shared_lib_for_lib64",
":native_shared_lib_2", ":native_shared_lib_for_first",
], ],
"//build/bazel/platforms/arch:x86_64": [ "//build/bazel/platforms/arch:x86_64": [
":native_shared_lib_1", ":native_shared_lib_for_both",
":native_shared_lib_4", ":native_shared_lib_for_lib64",
":native_shared_lib_2", ":native_shared_lib_for_first",
], ],
"//conditions:default": [], "//conditions:default": [],
})`, })`,
@@ -322,27 +322,27 @@ filegroup {
MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{ MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{
"native_shared_libs_32": `select({ "native_shared_libs_32": `select({
"//build/bazel/platforms/arch:arm": [ "//build/bazel/platforms/arch:arm": [
":native_shared_lib_1", ":native_shared_lib_for_both",
":native_shared_lib_3", ":native_shared_lib_for_lib32",
":native_shared_lib_2", ":native_shared_lib_for_first",
], ],
"//build/bazel/platforms/arch:x86": [ "//build/bazel/platforms/arch:x86": [
":native_shared_lib_1", ":native_shared_lib_for_both",
":native_shared_lib_3", ":native_shared_lib_for_lib32",
":native_shared_lib_2", ":native_shared_lib_for_first",
], ],
"//conditions:default": [], "//conditions:default": [],
})`, })`,
"native_shared_libs_64": `select({ "native_shared_libs_64": `select({
"//build/bazel/platforms/arch:arm64": [ "//build/bazel/platforms/arch:arm64": [
":native_shared_lib_1", ":native_shared_lib_for_both",
":native_shared_lib_4", ":native_shared_lib_for_lib64",
":native_shared_lib_2", ":native_shared_lib_for_first",
], ],
"//build/bazel/platforms/arch:x86_64": [ "//build/bazel/platforms/arch:x86_64": [
":native_shared_lib_1", ":native_shared_lib_for_both",
":native_shared_lib_4", ":native_shared_lib_for_lib64",
":native_shared_lib_2", ":native_shared_lib_for_first",
], ],
"//conditions:default": [], "//conditions:default": [],
})`, })`,
@@ -370,11 +370,11 @@ filegroup {
ExpectedBazelTargets: []string{ ExpectedBazelTargets: []string{
MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{ MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{
"native_shared_libs_32": `[ "native_shared_libs_32": `[
":native_shared_lib_1", ":native_shared_lib_for_both",
":native_shared_lib_3", ":native_shared_lib_for_lib32",
] + select({ ] + select({
"//build/bazel/platforms/arch:arm": [":native_shared_lib_2"], "//build/bazel/platforms/arch:arm": [":native_shared_lib_for_first"],
"//build/bazel/platforms/arch:x86": [":native_shared_lib_2"], "//build/bazel/platforms/arch:x86": [":native_shared_lib_for_first"],
"//conditions:default": [], "//conditions:default": [],
})`, })`,
"file_contexts": `"//system/sepolicy/apex:com.android.apogee-file_contexts"`, "file_contexts": `"//system/sepolicy/apex:com.android.apogee-file_contexts"`,
@@ -402,14 +402,14 @@ filegroup {
MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{ MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{
"native_shared_libs_64": `select({ "native_shared_libs_64": `select({
"//build/bazel/platforms/arch:arm64": [ "//build/bazel/platforms/arch:arm64": [
":native_shared_lib_1", ":native_shared_lib_for_both",
":native_shared_lib_4", ":native_shared_lib_for_lib64",
":native_shared_lib_2", ":native_shared_lib_for_first",
], ],
"//build/bazel/platforms/arch:x86_64": [ "//build/bazel/platforms/arch:x86_64": [
":native_shared_lib_1", ":native_shared_lib_for_both",
":native_shared_lib_4", ":native_shared_lib_for_lib64",
":native_shared_lib_2", ":native_shared_lib_for_first",
], ],
"//conditions:default": [], "//conditions:default": [],
})`, })`,
@@ -419,6 +419,56 @@ filegroup {
}}) }})
} }
func createMultilibBlueprint(compile_multilib string) string {
return `
cc_library {
name: "native_shared_lib_for_both",
bazel_module: { bp2build_available: false },
}
cc_library {
name: "native_shared_lib_for_first",
bazel_module: { bp2build_available: false },
}
cc_library {
name: "native_shared_lib_for_lib32",
bazel_module: { bp2build_available: false },
}
cc_library {
name: "native_shared_lib_for_lib64",
bazel_module: { bp2build_available: false },
}
apex {
name: "com.android.apogee",
compile_multilib: "` + compile_multilib + `",
multilib: {
both: {
native_shared_libs: [
"native_shared_lib_for_both",
],
},
first: {
native_shared_libs: [
"native_shared_lib_for_first",
],
},
lib32: {
native_shared_libs: [
"native_shared_lib_for_lib32",
],
},
lib64: {
native_shared_libs: [
"native_shared_lib_for_lib64",
],
},
},
}`
}
func TestApexBundleDefaultPropertyValues(t *testing.T) { func TestApexBundleDefaultPropertyValues(t *testing.T) {
runApexTestCase(t, Bp2buildTestCase{ runApexTestCase(t, Bp2buildTestCase{
Description: "apex - default property values", Description: "apex - default property values",
@@ -474,56 +524,6 @@ apex {
}}) }})
} }
func createMultilibBlueprint(compile_multilib string) string {
return `
cc_library {
name: "native_shared_lib_1",
bazel_module: { bp2build_available: false },
}
cc_library {
name: "native_shared_lib_2",
bazel_module: { bp2build_available: false },
}
cc_library {
name: "native_shared_lib_3",
bazel_module: { bp2build_available: false },
}
cc_library {
name: "native_shared_lib_4",
bazel_module: { bp2build_available: false },
}
apex {
name: "com.android.apogee",
compile_multilib: "` + compile_multilib + `",
multilib: {
both: {
native_shared_libs: [
"native_shared_lib_1",
],
},
first: {
native_shared_libs: [
"native_shared_lib_2",
],
},
lib32: {
native_shared_libs: [
"native_shared_lib_3",
],
},
lib64: {
native_shared_libs: [
"native_shared_lib_4",
],
},
},
}`
}
func TestBp2BuildOverrideApex(t *testing.T) { func TestBp2BuildOverrideApex(t *testing.T) {
runOverrideApexTestCase(t, Bp2buildTestCase{ runOverrideApexTestCase(t, Bp2buildTestCase{
Description: "override_apex", Description: "override_apex",