From 1b1eb9b3afbb846149d766f181d59cc9941073ca Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Tue, 18 Jun 2024 18:17:39 +0100
Subject: [PATCH] Support passing multiple --migrate-nullness option for
 java_api_library

Bug: 347751326
Test: m droid
Change-Id: I7702021348004b5f6d686d71ee566c5589dbc4f5
---
 java/java.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/java.go b/java/java.go
index 08fb6782c..39d022313 100644
--- a/java/java.go
+++ b/java/java.go
@@ -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)