diff options
| author | 2017-10-18 14:44:18 -0700 | |
|---|---|---|
| committer | 2017-10-19 20:45:11 +0000 | |
| commit | 1ee2317555954d49086fa58d46690ef933eb1ae9 (patch) | |
| tree | e315d48125cf7f96d065bbe796b8340f3fea21ea /java/builder.go | |
| parent | 702e0f8ab03edf50e55d08f8b78595462f1f564f (diff) | |
Move all jar intermediates to subdirs
Make all the jar intermediates called modulename.jar, and put each
in a subdir for the tool that generated it. This will simplify
using the jars as inputs to genrules and resources.
Test: java_test.go
Change-Id: If00e16bd7df5a4ba24ebc4b68c9ccf2cfda49544
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/java/builder.go b/java/builder.go index 9086d5185..4aaf84127 100644 --- a/java/builder.go +++ b/java/builder.go @@ -160,7 +160,7 @@ func TransformKotlinToClasses(ctx android.ModuleContext, outputFile android.Writ srcFiles android.Paths, srcJars classpath, flags javaBuilderFlags) { - classDir := android.PathForModuleOut(ctx, "classes-kt") + classDir := android.PathForModuleOut(ctx, "kotlinc", "classes") inputs := append(android.Paths(nil), srcFiles...) inputs = append(inputs, srcJars...) @@ -184,7 +184,7 @@ func TransformJavaToClasses(ctx android.ModuleContext, outputFile android.Writab flags javaBuilderFlags, deps android.Paths) { transformJavaToClasses(ctx, outputFile, srcFiles, srcJars, flags, deps, - "", "javac", javac) + "javac", "javac", javac) } func RunErrorProne(ctx android.ModuleContext, outputFile android.WritablePath, @@ -196,7 +196,7 @@ func RunErrorProne(ctx android.ModuleContext, outputFile android.WritablePath, } transformJavaToClasses(ctx, outputFile, srcFiles, srcJars, flags, nil, - "-errorprone", "errorprone", errorprone) + "errorprone", "errorprone", errorprone) } // transformJavaToClasses takes source files and converts them to a jar containing .class files. @@ -211,7 +211,7 @@ func RunErrorProne(ctx android.ModuleContext, outputFile android.WritablePath, func transformJavaToClasses(ctx android.ModuleContext, outputFile android.WritablePath, srcFiles android.Paths, srcJars classpath, flags javaBuilderFlags, deps android.Paths, - intermediatesSuffix, desc string, rule blueprint.Rule) { + intermediatesDir, desc string, rule blueprint.Rule) { deps = append(deps, srcJars...) @@ -237,8 +237,8 @@ func transformJavaToClasses(ctx android.ModuleContext, outputFile android.Writab "bootClasspath": bootClasspath, "sourcepath": srcJars.JavaSourcepath(), "classpath": flags.classpath.JavaClasspath(), - "outDir": android.PathForModuleOut(ctx, "classes"+intermediatesSuffix).String(), - "annoDir": android.PathForModuleOut(ctx, "anno"+intermediatesSuffix).String(), + "outDir": android.PathForModuleOut(ctx, intermediatesDir, "classes").String(), + "annoDir": android.PathForModuleOut(ctx, intermediatesDir, "anno").String(), "javaVersion": flags.javaVersion, }, }) @@ -288,7 +288,7 @@ func TransformJarsToJar(ctx android.ModuleContext, outputFile android.WritablePa func TransformDesugar(ctx android.ModuleContext, outputFile android.WritablePath, classesJar android.Path, flags javaBuilderFlags) { - dumpDir := android.PathForModuleOut(ctx, "desugar_dumped_classes") + dumpDir := android.PathForModuleOut(ctx, "desugar", "classes") javaFlags := "" if ctx.AConfig().UseOpenJDK9() { |