Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c964841e authored by Joseph Murphy's avatar Joseph Murphy
Browse files

Changes tree built Robolectric name 

Bug: b/194219998
Test: locally ran all in-tree Robolectric tests
Change-Id: If13583f6a2882e2e78d3004afc476debf6692df9
Merged-In: If13583f6a2882e2e78d3004afc476debf6692df9
parent f05bea08

java/robolectric.go

+4 −4
Original line number Diff line number Diff line
@@ -417,10 +417,10 @@ 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")

		// "TREE" name is essential here because it hooks into the "TREE" name in

		// Robolectric's SdkConfig.java that will always correspond to the NEWEST_SDK

		// in Robolectric configs.

		runtimeName := "android-all-current-robolectric-r0.jar"

		installedRuntime := ctx.InstallFile(androidAllDir, runtimeName, runtimeFromSourceJar)

		r.runtimes = append(r.runtimes, installedRuntime)

	}