Merge "Install VNDK libraries into vendor or product lib with flag" into main

This commit is contained in:
Treehugger Robot
2023-07-19 04:44:51 +00:00
committed by Gerrit Code Review
3 changed files with 7 additions and 1 deletions

View File

@@ -2275,7 +2275,7 @@ func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) {
// do not install vndk libs
// vndk libs are packaged into VNDK APEX
if ctx.isVndk() && !ctx.IsVndkExt() {
if ctx.isVndk() && !ctx.IsVndkExt() && !ctx.Config().IsVndkDeprecated() {
return
}
} else if library.hasStubsVariants() && !ctx.Host() && ctx.directlyInAnyApex() {