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

Merge "Fix FirstUniqueStrings after conversion to generics" am: da169a1ee3 am: e5f8e56262 am: 146391ed48 am: 987869d644 am: cd925b6d9e am: 995c8f610a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2640231

Change-Id: I4e9a477c1257278061ffceb06ef245d28c1432b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-29 23:49:41 +00:00
committed by Automerger Merge Worker
parent 1604552902 995c8f610a
commit 8359db9dc0
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) {