diff options
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/java/java.go b/java/java.go index d9075b175..dbf202a00 100644 --- a/java/java.go +++ b/java/java.go @@ -142,6 +142,11 @@ type CompilerProperties struct { Exclude_filter []string } + Proto struct { + // List of extra options that will be passed to the proto generator. + Output_params []string + } + Instrument bool `blueprint:"mutated"` } @@ -620,7 +625,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path } srcFiles := ctx.ExpandSources(j.properties.Srcs, j.properties.Exclude_srcs) if hasSrcExt(srcFiles.Strings(), ".proto") { - flags = protoFlags(ctx, &j.protoProperties, flags) + flags = protoFlags(ctx, &j.properties, &j.protoProperties, flags) } srcFiles = j.genSources(ctx, srcFiles, flags) @@ -672,7 +677,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path // Store the list of .java files that was passed to javac j.compiledJavaSrcs = uniqueSrcFiles j.compiledSrcJars = srcJars - fullD8 := ctx.AConfig().IsEnvTrue("USE_D8_DESUGAR") + fullD8 := ctx.Config().UseD8Desugar() enable_sharding := false if ctx.Device() && !ctx.Config().IsEnvFalse("TURBINE_ENABLED") { @@ -776,6 +781,9 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path if len(jars) == 1 && !manifest.Valid() { // Optimization: skip the combine step if there is nothing to do + // TODO(ccross): this leaves any module-info.class files, but those should only come from + // prebuilt dependencies until we support modules in the platform build, so there shouldn't be + // any if len(jars) == 1. outputFile = jars[0] } else { combinedJar := android.PathForModuleOut(ctx, "combined", jarName) @@ -889,7 +897,7 @@ func (j *Module) desugar(ctx android.ModuleContext, flags javaBuilderFlags, func (j *Module) instrument(ctx android.ModuleContext, flags javaBuilderFlags, classesJar android.Path, jarName string) android.Path { - specs := j.jacocoStripSpecs(ctx) + specs := j.jacocoModuleToZipCommand(ctx) jacocoReportClassesFile := android.PathForModuleOut(ctx, "jacoco", "jacoco-report-classes.jar") instrumentedJar := android.PathForModuleOut(ctx, "jacoco", jarName) @@ -937,20 +945,12 @@ func (j *Module) compileDexFullD8(ctx android.ModuleContext, flags javaBuilderFl // to D8 flags. See: b/69377755 var dxFlags []string for _, x := range j.deviceProperties.Dxflags { - if x == "--core-library" { - continue - } - if x == "--dex" { - continue - } - if x == "--multi-dex" { - continue - } - if x == "--no-locals" { - dxFlags = append(dxFlags, "--release") + switch x { + case "--core-library", "--dex", "--multi-dex": continue + default: + dxFlags = append(dxFlags, x) } - dxFlags = append(dxFlags, x) } if ctx.AConfig().Getenv("NO_OPTIMIZE_DX") != "" { |