Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0476e46 authored by Anna Bauza's avatar Anna Bauza Committed by Gerrit Code Review
Browse files

Revert "Add the implicit deps of javacRE" 

This reverts commit eaa47510.

Reason for revert: This cl broke AOSP build, read more b/333846153

Change-Id: I5538a3c78617d7c2db98a11b60cb61269dcec8d3
parent eaa47510

java/builder.go

+14 −32
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package java 
// functions.



import (

	"fmt"

	"path/filepath"

	"strconv"

	"strings"
@@ -69,8 +68,6 @@ var ( 
		}, map[string]*remoteexec.REParams{

			"$javaTemplate": &remoteexec.REParams{

				Labels:       map[string]string{"type": "compile", "lang": "java", "compiler": "javac"},

				Inputs:       []string{"${config.JavacCmd}"},

				RSPFiles:     []string{"${out}.rsp", "${javacREClasspathDeps}"},

				ExecStrategy: "${config.REJavacExecStrategy}",

				Platform:     map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"},

			},
@@ -89,7 +86,7 @@ var ( 
				Platform:     map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"},

			},

		}, []string{"javacFlags", "bootClasspath", "classpath", "processorpath", "processor", "srcJars", "srcJarDir",

			"outDir", "annoDir", "annoSrcJar", "javaVersion"}, []string{"javacREClasspathDeps"})

			"outDir", "annoDir", "annoSrcJar", "javaVersion"}, nil)



	_ = pctx.VariableFunc("kytheCorpus",

		func(ctx android.PackageVarContext) string { return ctx.Config().XrefCorpusName() })
@@ -604,7 +601,17 @@ func transformJavaToClasses(ctx android.ModuleContext, outputFile android.Writab 
		annoDir = filepath.Join(shardDir, annoDir)

	}

	rule := javac

	args := map[string]string{

	if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_JAVAC") {

		rule = javacRE

	}

	ctx.Build(pctx, android.BuildParams{

		Rule:           rule,

		Description:    desc,

		Output:         outputFile,

		ImplicitOutput: annoSrcJar,

		Inputs:         srcFiles,

		Implicits:      deps,

		Args: map[string]string{

			"javacFlags":    flags.javacFlags,

			"bootClasspath": bootClasspath,

			"classpath":     classpathArg,
@@ -616,32 +623,7 @@ func transformJavaToClasses(ctx android.ModuleContext, outputFile android.Writab 
			"annoDir":       android.PathForModuleOut(ctx, intermediatesDir, annoDir).String(),

			"annoSrcJar":    annoSrcJar.String(),

			"javaVersion":   flags.javaVersion.String(),

	}



	if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_JAVAC") {

		rule = javacRE



		// Write the classpath deps to a file that can be passed as an input to javacRE.

		// Skip the shardIdx if the java library is unsharded

		shardIdxSuffix := strconv.Itoa(shardIdx)

		if shardIdx == -1 {

			shardIdxSuffix = ""

		}

		javacREClasspathDepsFile := outputFile.ReplaceExtension(ctx, fmt.Sprintf("javacre.classpathdeps%v", shardIdxSuffix))

		android.WriteFileRule(ctx, javacREClasspathDepsFile, strings.Join(javacClasspath.Strings(), ",")) // The classpath jars are an implicit dep of javacRE

		args["javacREClasspathDeps"] = javacREClasspathDepsFile.String()



		// Add the deps file to the implicit inputs

		deps = append(deps, javacREClasspathDepsFile)

	}

	ctx.Build(pctx, android.BuildParams{

		Rule:           rule,

		Description:    desc,

		Output:         outputFile,

		ImplicitOutput: annoSrcJar,

		Inputs:         srcFiles,

		Implicits:      deps,

		Args:           args,

		},

	})

}