StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix FirstUniqueStrings after conversion to generics"

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-29 18:46:20 +00:00
committed by Gerrit Code Review
parent 187aa29056 48016d5a2f
commit da169a1ee3
6 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/dexpreopt_config.go
View File

@@ -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)
}

2
java/robolectric.go
View File

@@ -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) {