diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-27 02:27:10 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-27 02:27:10 +0000 |
commit | 9d7a8975d9eae1fe22788707c41a67e6e3ce92c7 (patch) | |
tree | a2eccd26193e970726af5fd4e6799b79a571855a /java/java.go | |
parent | 36bd23552aee4fb119aff13d2d4a20b293660a2d (diff) | |
parent | d9c1c8fbcb242d2aacebbd9dc28702b402fe44f4 (diff) | |
download | android_build_soong-9d7a8975d9eae1fe22788707c41a67e6e3ce92c7.tar.gz android_build_soong-9d7a8975d9eae1fe22788707c41a67e6e3ce92c7.tar.bz2 android_build_soong-9d7a8975d9eae1fe22788707c41a67e6e3ce92c7.zip |
Snap for 6034952 from d9c1c8fbcb242d2aacebbd9dc28702b402fe44f4 to qt-qpr2-release
Change-Id: If50010e646664876b1e50fa9a4a49a766a60e94f
Diffstat (limited to 'java/java.go')
-rw-r--r-- | java/java.go | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/java/java.go b/java/java.go index bf738c4d..9ac38c92 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) |