Merge "Allow libz to have stub even though it's not an LLNDK library" am: b4ce1e972c am: 86a5ba673e

Change-Id: I8caaeec8de07a09ea4c209602d8b7de182e45cad
This commit is contained in:
Treehugger Robot 2020-05-18 08:57:48 +00:00 committed by Automerger Merge Worker
commit 8968836a91
1 changed files with 6 additions and 1 deletions

View File

@ -309,7 +309,12 @@ func processVndkLibrary(mctx android.BottomUpMutatorContext, m *Module) {
panic(err)
}
if m.HasStubsVariants() {
if m.HasStubsVariants() && name != "libz" {
// b/155456180 libz is the ONLY exception here. We don't want to make
// libz an LLNDK library because APIs required for vendors might be
// wider than what we expose as NDK/Mainline APIs. As the library is
// an external one, it's risky to keep the API stability promise if
// it becomes an LLNDK.
mctx.PropertyErrorf("vndk.enabled", "This library provides stubs. Shouldn't be VNDK. Consider making it as LLNDK")
}