Revert "Supports VNDK APEX with different versions"
This reverts commit 394951da73ec7a7a2b6353d75657dfd2d7c81ab8.
Reason for revert: some targets are broken
Bug: 142773030
Change-Id: I4ce2e4a4c683c71958bc4f73e45a5ddd4a4ae32a
diff --git a/cc/cc.go b/cc/cc.go
index ae9b52f..9031afe 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -488,6 +488,15 @@
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()
}