diff --git a/cc/vndk.go b/cc/vndk.go index 5bd9b2359..dbe1f3b5b 100644 --- a/cc/vndk.go +++ b/cc/vndk.go @@ -309,12 +309,7 @@ func processVndkLibrary(mctx android.BottomUpMutatorContext, m *Module) { panic(err) } - 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. + if m.HasStubsVariants() { mctx.PropertyErrorf("vndk.enabled", "This library provides stubs. Shouldn't be VNDK. Consider making it as LLNDK") }