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

Merge "Refactor some tests to not use bp2build_avail" into main

Browse Source
This commit is contained in:
Christopher Parsons
2023-09-21 20:57:33 +00:00
committed by Gerrit Code Review
parent 44e4102362 4c81ce0307
commit 92c59496e0
7 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bp2build/cc_library_shared_conversion_test.go
View File

@@ -1595,6 +1595,7 @@ func TestCcLibrarySdkVariantUsesStubs(t *testing.T) {
Description: "cc_library_shared stubs",
ModuleTypeUnderTest: "cc_library_shared",
ModuleTypeUnderTestFactory: cc.LibrarySharedFactory,
StubbedBuildDefinitions: []string{"libNoStubs", "libHasApexStubs", "libHasApexAndNdkStubs"},
Blueprint: soongCcLibrarySharedPreamble + `
cc_library_shared {
name: "libUsesSdk",
@@ -1607,22 +1608,21 @@ cc_library_shared {
}
cc_library_shared {
name: "libNoStubs",
bazel_module: { bp2build_available: false },
}
cc_library_shared {
name: "libHasApexStubs",
stubs: { symbol_file: "a.map.txt", versions: ["28", "29", "current"] },
bazel_module: { bp2build_available: false },
apex_available: ["apex_a"],
}
cc_library_shared {
name: "libHasApexAndNdkStubs",
stubs: { symbol_file: "b.map.txt", versions: ["28", "29", "current"] },
bazel_module: { bp2build_available: false },
apex_available: ["apex_b"],
}
ndk_library {
name: "libHasApexAndNdkStubs",
// TODO: b/301321658 - Stub this once existing-build-file handling can deal with
// modules that generate targets of a different name.
bazel_module: { bp2build_available: false },
}
`,