diff options
| author | 2023-06-29 18:46:20 +0000 | |
|---|---|---|
| committer | 2023-06-29 18:46:20 +0000 | |
| commit | da169a1ee35f00a164843ffecdfc632b3ba96d87 (patch) | |
| tree | d89a4ac902648309f43be7f2eeaabd00bd3310e5 /java | |
| parent | 187aa2905643881a5cbca62b9389306741a55cfd (diff) | |
| parent | 48016d5a2f3d0a518de795e4eba6d899628a86bb (diff) | |
Merge "Fix FirstUniqueStrings after conversion to generics"
Diffstat (limited to 'java')
| -rw-r--r-- | java/dexpreopt_config.go | 2 | ||||
| -rw-r--r-- | java/robolectric.go | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go index 9100e87c6..28f50d7e3 100644 --- a/java/dexpreopt_config.go +++ b/java/dexpreopt_config.go @@ -250,8 +250,6 @@ func bcpForDexpreopt(ctx android.PathContext, withUpdatable bool) (android.Writa var defaultBootclasspathKey = android.NewOnceKey("defaultBootclasspath") -var copyOf = android.CopyOf - func init() { android.RegisterMakeVarsProvider(pctx, dexpreoptConfigMakevars) } diff --git a/java/robolectric.go b/java/robolectric.go index 6bbe872bb..0041af429 100644 --- a/java/robolectric.go +++ b/java/robolectric.go @@ -299,7 +299,7 @@ func generateSameDirRoboTestConfigJar(ctx android.ModuleContext, outputFile andr func (r *robolectricTest) generateRoboSrcJar(ctx android.ModuleContext, outputFile android.WritablePath, instrumentedApp *AndroidApp) { - srcJarArgs := copyOf(instrumentedApp.srcJarArgs) + srcJarArgs := android.CopyOf(instrumentedApp.srcJarArgs) srcJarDeps := append(android.Paths(nil), instrumentedApp.srcJarDeps...) for _, m := range ctx.GetDirectDepsWithTag(roboCoverageLibsTag) { |