Add support for cc_library_headers to replace llndk_headers

Set llndk.llndk_headers: true to allow a cc_library_headers
module to be used by a cc_library module with llndk.symbol_file set.

Bug: 170784825
Test: TestLlndkHeaders
Change-Id: Ib65a4b70717dc9a54ae30f2991485bb1bb9b8409
This commit is contained in:
Colin Cross
2021-04-26 18:37:44 -07:00
parent be763f7b16
commit 1f3f130e29
6 changed files with 18 additions and 7 deletions

View File

@@ -437,13 +437,13 @@ func MutateImage(mctx android.BaseModuleContext, m ImageMutatableModule) {
productVndkVersion = platformVndkVersion
}
if m.IsLlndkLibrary() || m.IsLlndkHeaders() || m.HasLlndkStubs() {
if m.IsLlndkLibrary() || m.IsLlndkHeaders() || m.NeedsLlndkVariants() {
// This is an LLNDK library. The implementation of the library will be on /system,
// and vendor and product variants will be created with LLNDK stubs.
// The LLNDK libraries need vendor variants even if there is no VNDK.
// The obsolete llndk_library and llndk_headers modules also need the vendor variants
// so the cc_library LLNDK stubs can depend on them.
if m.HasLlndkStubs() {
if m.NeedsLlndkVariants() {
coreVariantNeeded = true
}
if platformVndkVersion != "" {