Merge "Adds a workaround to fix version inconsistency" am: bac4ee008b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1402212 Change-Id: If3d9546e4ca2c0dc7e41c96e05a1fef79cee5ffd
This commit is contained in:
@@ -389,8 +389,10 @@ func (r *robolectricRuntimes) GenerateAndroidBuildActions(ctx android.ModuleCont
|
|||||||
}
|
}
|
||||||
runtimeFromSourceJar := android.OutputFileForModule(ctx, runtimeFromSourceModule, "")
|
runtimeFromSourceJar := android.OutputFileForModule(ctx, runtimeFromSourceModule, "")
|
||||||
|
|
||||||
|
// TODO(murj) Update this to ctx.Config().PlatformSdkCodename() once the platform
|
||||||
|
// classes like android.os.Build are updated to S.
|
||||||
runtimeName := fmt.Sprintf("android-all-%s-robolectric-r0.jar",
|
runtimeName := fmt.Sprintf("android-all-%s-robolectric-r0.jar",
|
||||||
ctx.Config().PlatformSdkCodename())
|
"R")
|
||||||
installedRuntime := ctx.InstallFile(androidAllDir, runtimeName, runtimeFromSourceJar)
|
installedRuntime := ctx.InstallFile(androidAllDir, runtimeName, runtimeFromSourceJar)
|
||||||
r.runtimes = append(r.runtimes, installedRuntime)
|
r.runtimes = append(r.runtimes, installedRuntime)
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user