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

2023-01-06 22:37:15 +00:00
parent c8fe431e89 e3ae3dd6f9
commit 5366821635
3 changed files with 3 additions and 3 deletions
--- 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,
 		}}