Merge "Support passing multiple --migrate-nullness option for java_api_library" into main am: 94811f3031
am: bda26557b7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137213 Change-Id: I9eede13adcf6aee2b62fb95d3893b83195cc5557 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user