diff options
| -rw-r--r-- | cc/cc.go | 2 | ||||
| -rw-r--r-- | cc/fuzz.go | 2 | ||||
| -rw-r--r-- | java/androidmk.go | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -3520,7 +3520,7 @@ func (c *Module) IsInstallableToApex() bool { if lib := c.library; lib != nil { // Stub libs and prebuilt libs in a versioned SDK are not // installable to APEX even though they are shared libs. - return lib.shared() && !lib.buildStubs() && c.ContainingSdk().Unversioned() + return lib.shared() && !lib.buildStubs() && !android.IsModuleInVersionedSdk(c) } else if _, ok := c.linker.(testPerSrc); ok { return true } diff --git a/cc/fuzz.go b/cc/fuzz.go index 3da76512e..d714bf2aa 100644 --- a/cc/fuzz.go +++ b/cc/fuzz.go @@ -211,7 +211,7 @@ func IsValidSharedDependency(dependency android.Module) bool { // Discard versioned members of SDK snapshots, because they will conflict with // unversioned ones. - if sdkMember, ok := dependency.(android.SdkAware); ok && !sdkMember.ContainingSdk().Unversioned() { + if android.IsModuleInVersionedSdk(dependency) { return false } diff --git a/java/androidmk.go b/java/androidmk.go index 42b4ef1b2..e37a90e0f 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -200,7 +200,7 @@ func (prebuilt *Import) AndroidMkEntries() []android.AndroidMkEntries { dexpreoptEntries := prebuilt.dexpreopter.AndroidMkEntriesForApex() return append(dexpreoptEntries, android.AndroidMkEntries{Disabled: true}) } - if !prebuilt.ContainingSdk().Unversioned() { + if android.IsModuleInVersionedSdk(prebuilt) { return []android.AndroidMkEntries{android.AndroidMkEntries{ Disabled: true, }} |