Extract IsModuleInVersionedSdk

Bug: 177892522
Test: m nothing
Change-Id: I348d380a0d29abdd6a84420be52cc1b674f2a7ab
This commit is contained in:
Paul Duffin
2021-04-28 00:39:52 +01:00
parent 59dc69c2c7
commit 0c2e08312c
3 changed files with 14 additions and 6 deletions

View File

@@ -226,10 +226,8 @@ type platformCompatConfigSingleton struct {
func isModulePreferredByCompatConfig(module android.Module) bool {
// A versioned prebuilt_platform_compat_config, i.e. foo-platform-compat-config@current should be
// ignored.
if s, ok := module.(android.SdkAware); ok {
if !s.ContainingSdk().Unversioned() {
return false
}
if android.IsModuleInVersionedSdk(module) {
return false
}
return android.IsModulePreferred(module)