Revert "Revert "Supports VNDK APEX with different versions""

This reverts commit 48dd4b5ea4.

Bug: 141451661
Bug: 139772411
Test: m (soong tests)
Test: boot with aosp_arm64 system image on Q vendor device
This commit is contained in:
Jooyung Han
2019-10-18 16:26:59 +09:00
parent 43bfaf9f65
commit 31c470b5d5
6 changed files with 291 additions and 98 deletions

View File

@@ -488,15 +488,6 @@ func (c *Module) RelativeInstallPath() string {
return ""
}
// IsVndkOnSystem returns true if a module is supposed to be a vndk library provided by system to vendor
func (c *Module) IsVndkOnSystem() bool {
if linker, ok := c.linker.(libraryInterface); ok {
return linker.shared() && c.isVndk() && c.useVndk() && !c.isVndkExt()
}
return false
}
func (c *Module) VndkVersion() string {
return c.vndkVersion()
}