StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Dedup checks for module being in versioned sdk snapshot"

Browse Source
This commit is contained in:
Paul Duffin
2023-01-06 22:37:15 +00:00
committed by Gerrit Code Review
parent c8fe431e89 e3ae3dd6f9
commit 5366821635
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/cc.go
View File

@@ -3539,7 +3539,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
}

2
cc/fuzz.go
View File

@@ -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
}

2
java/androidmk.go
View File

@@ -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,
}}