summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2024-06-19 09:48:09 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-06-19 09:48:09 +0000
commit94811f3031c1b19396080a57571130ba0c1cced9 (patch)
tree86422c4c469ec0b9474c00fd4447ff0edfa3b23b /java/java.go
parentc0cbb491d5e255fa956e27fefc0c7621e287d075 (diff)
parent1b1eb9b3afbb846149d766f181d59cc9941073ca (diff)
Merge "Support passing multiple --migrate-nullness option for java_api_library" into main
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/java/java.go b/java/java.go
index 95eaa20cb..6fee7ce9a 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)