From a95304ec10b3b518fd47cd7677c4d46b124fdde9 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 23 Sep 2019 14:33:09 -0700 Subject: Move sharding functions for reuse Move shardPaths and shardTests to android.ShardPaths and android.ShardStrings for reuse in other packages. Bug: 144948629 Test: m checkbuild Change-Id: I868802872c73616b80f56cbf11f959c01a8b793a Merged-In: I868802872c73616b80f56cbf11f959c01a8b793a (cherry picked from commit 0a2f719bcaad397f27bcf52cd6604df6b5cec03b) --- java/java.go | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index bf738c4d3..9ac38c92c 100644 --- a/java/java.go +++ b/java/java.go @@ -530,18 +530,6 @@ func hasSrcExt(srcs []string, ext string) bool { return false } -func shardPaths(paths android.Paths, shardSize int) []android.Paths { - ret := make([]android.Paths, 0, (len(paths)+shardSize-1)/shardSize) - for len(paths) > shardSize { - ret = append(ret, paths[0:shardSize]) - paths = paths[shardSize:] - } - if len(paths) > 0 { - ret = append(ret, paths) - } - return ret -} - func (j *Module) hasSrcExt(ext string) bool { return hasSrcExt(j.properties.Srcs, ext) } @@ -1088,7 +1076,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path shardSize := int(*(j.properties.Javac_shard_size)) var shardSrcs []android.Paths if len(uniqueSrcFiles) > 0 { - shardSrcs = shardPaths(uniqueSrcFiles, shardSize) + shardSrcs = android.ShardPaths(uniqueSrcFiles, shardSize) for idx, shardSrc := range shardSrcs { classes := android.PathForModuleOut(ctx, "javac", jarName+strconv.Itoa(idx)) TransformJavaToClasses(ctx, classes, idx, shardSrc, nil, flags, extraJarDeps) -- cgit v1.2.3-59-g8ed1b