tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Adds a workaround to fix version inconsistency"

Browse source 
This reverts commit bc98d2ffe8.

Reason for revert: It was much to my chagrin that I realized the main purpose of this build target is an actually an internal branch which has the changes which make S the default for Robolectric.  This will complicate things a little bit in the short term, but in principle, this revert can be merged over with those changes down the line.

Change-Id: I053a32d89bfdf33486d95a30b145eb3b6f57df1d
This commit is contained in:
Joseph Murphy 2020-11-19 00:59:38 +00:00
parent f828c49069
commit fdb9f7f449
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
java/robolectric.go
View file

@ -389,10 +389,8 @@ func (r *robolectricRuntimes) GenerateAndroidBuildActions(ctx android.ModuleCont
}
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",
"R")
ctx.Config().PlatformSdkCodename())
installedRuntime := ctx.InstallFile(androidAllDir, runtimeName, runtimeFromSourceJar)
r.runtimes = append(r.runtimes, installedRuntime)
}