diff options
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/java/java.go b/java/java.go index 480518e76..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) @@ -1465,8 +1453,6 @@ func (j *Module) CompilerDeps() []string { type Library struct { Module - - InstallMixin func(ctx android.ModuleContext, installPath android.Path) (extraInstallDeps android.Paths) } func shouldUncompressDex(ctx android.ModuleContext, dexpreopter *dexpreopter) bool { @@ -1496,12 +1482,8 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.compile(ctx) if (Bool(j.properties.Installable) || ctx.Host()) && !android.DirectlyInAnyApex(ctx, ctx.ModuleName()) { - var extraInstallDeps android.Paths - if j.InstallMixin != nil { - extraInstallDeps = j.InstallMixin(ctx, j.outputFile) - } j.installFile = ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"), - ctx.ModuleName()+".jar", j.outputFile, extraInstallDeps...) + ctx.ModuleName()+".jar", j.outputFile) } } |