summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2019-09-23 14:33:09 -0700
committerColin Cross <ccross@android.com>2019-09-29 23:26:37 -0700
commit0a2f719bcaad397f27bcf52cd6604df6b5cec03b (patch)
tree9800973e04508e6440026f8e56fd876f7fc33807 /java/java.go
parent852116a061d8a339d0bca72744941537bcdba7ca (diff)
Move sharding functions for reuse
Move shardPaths and shardTests to android.ShardPaths and android.ShardStrings for reuse in other packages. Test: m checkbuild Change-Id: I868802872c73616b80f56cbf11f959c01a8b793a
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go14
1 files changed, 1 insertions, 13 deletions
diff --git a/java/java.go b/java/java.go
index ce72c2760..f7b0f53ba 100644
--- a/java/java.go
+++ b/java/java.go
@@ -580,18 +580,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)
}
@@ -1156,7 +1144,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar 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 := j.compileJavaClasses(ctx, jarName, idx, shardSrc,
nil, flags, extraJarDeps)