Merge "Support passing multiple --migrate-nullness option for java_api_library" into main

This commit is contained in:
Paul Duffin
2024-06-19 09:48:09 +00:00
committed by Gerrit Code Review

View File

@@ -2285,10 +2285,10 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) {
al.stubsFlags(ctx, cmd, stubsDir)
migratingNullability := String(al.properties.Previous_api) != ""
if migratingNullability {
previousApi := android.PathForModuleSrc(ctx, String(al.properties.Previous_api))
cmd.FlagWithInput("--migrate-nullness ", previousApi)
previousApi := String(al.properties.Previous_api)
if previousApi != "" {
previousApiFiles := android.PathsForModuleSrc(ctx, []string{previousApi})
cmd.FlagForEachInput("--migrate-nullness ", previousApiFiles)
}
al.addValidation(ctx, cmd, al.validationPaths)