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:
9
cc/cc.go
9
cc/cc.go
@@ -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()
|
||||
}
|
||||
|
Reference in New Issue
Block a user