Revert "mixed builds correctly reference stubs libs"
This reverts commit ca438e6b72
.
Reason for revert: ci post-submit failures in aosp-master-bazel of targets mixed-droid-clean and mixed-droid-incremental:
FAILED: ninja: 'out/target/product/generic_arm64/obj/SHARED_LIBRARIES/libc_intermediates/libc.so.toc', needed by 'out/target/product/generic_arm64/obj/EXECUTABLES/updater_intermediates/LINKED/updater', missing and no known rule to make it
12:21:27 ninja failed with: exit status 1
Change-Id: I081b499d23f2568cdf6227c4e3b0278164086b69
This commit is contained in:
committed by
Gerrit Code Review
parent
ca438e6b72
commit
1db4348734
@@ -1249,40 +1249,3 @@ cc_library_shared {
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
func TestCcLibrarySharedStubsDessertVersionConversion(t *testing.T) {
|
||||
runCcLibrarySharedTestCase(t, Bp2buildTestCase{
|
||||
Description: "cc_library_shared converts dessert codename versions to numerical versions",
|
||||
Blueprint: `
|
||||
cc_library_shared {
|
||||
name: "a",
|
||||
include_build_directory: false,
|
||||
stubs: {
|
||||
symbol_file: "a.map.txt",
|
||||
versions: [
|
||||
"Q",
|
||||
"R",
|
||||
"31",
|
||||
"current",
|
||||
],
|
||||
},
|
||||
}
|
||||
`,
|
||||
ExpectedBazelTargets: []string{
|
||||
makeCcStubSuiteTargets("a", AttrNameToString{
|
||||
"soname": `"a.so"`,
|
||||
"source_library_label": `"//:a"`,
|
||||
"stubs_symbol_file": `"a.map.txt"`,
|
||||
"stubs_versions": `[
|
||||
"29",
|
||||
"30",
|
||||
"31",
|
||||
"current",
|
||||
]`,
|
||||
}),
|
||||
MakeBazelTarget("cc_library_shared", "a", AttrNameToString{
|
||||
"stubs_symbol_file": `"a.map.txt"`,
|
||||
}),
|
||||
},
|
||||
})
|
||||
}
|
||||
|
Reference in New Issue
Block a user