diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/androidmk.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index a4dac80d4..d73ff4616 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -76,9 +76,6 @@ func (library *Library) AndroidMkEntries() []android.AndroidMkEntries { entriesList = append(entriesList, dexpreoptEntries...) } entriesList = append(entriesList, android.AndroidMkEntries{Disabled: true}) - } else if !library.ApexModuleBase.AvailableFor(android.AvailableToPlatform) { - // Platform variant. If not available for the platform, we don't need Make module. - entriesList = append(entriesList, android.AndroidMkEntries{Disabled: true}) } else { entriesList = append(entriesList, android.AndroidMkEntries{ Class: "JAVA_LIBRARIES", @@ -94,7 +91,8 @@ func (library *Library) AndroidMkEntries() []android.AndroidMkEntries { entries.AddStrings("LOCAL_LOGTAGS_FILES", logtags...) } - if library.installFile == nil { + if library.installFile == nil || !library.ApexModuleBase.AvailableFor(android.AvailableToPlatform) { + // If the ApexModule is not available for the platform, it shouldn't be installed. entries.SetBoolIfTrue("LOCAL_UNINSTALLABLE_MODULE", true) } if library.dexJarFile.IsSet() { |