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

Commit f15ed4fe authored by Kousik Kumar's avatar Kousik Kumar Committed by Automerger Merge Worker
Browse files

Merge "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c03 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1419252

Change-Id: I52b7a3810fdf3314ae107f4b8330e9d6f62c6302
parents 410b20db 3e0b9c03

apex/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
		a.container_certificate_file,

		a.container_private_key_file,

	}

	if ctx.Config().IsEnvTrue("RBE_SIGNAPK") {

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

		rule = java.SignapkRE

		args["implicits"] = strings.Join(implicits.Strings(), ",")

		args["outCommaList"] = a.outputFile.String()

cc/builder.go

+5 −5
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ func TransformSourceToObj(ctx android.ModuleContext, subdir string, srcFiles and 
			tidyFiles = append(tidyFiles, tidyFile)



			rule := clangTidy

			if ctx.Config().IsEnvTrue("RBE_CLANG_TIDY") {

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

				rule = clangTidyRE

			}
@@ -610,7 +610,7 @@ func TransformSourceToObj(ctx android.ModuleContext, subdir string, srcFiles and 
			sAbiDumpFiles = append(sAbiDumpFiles, sAbiDumpFile)



			dumpRule := sAbiDump

			if ctx.Config().IsEnvTrue("RBE_ABI_DUMPER") {

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

				dumpRule = sAbiDumpRE

			}

			ctx.Build(pctx, android.BuildParams{
@@ -745,7 +745,7 @@ func TransformObjToDynamicBinary(ctx android.ModuleContext, 
		"ldFlags":       flags.globalLdFlags + " " + flags.localLdFlags,

		"crtEnd":        crtEnd.String(),

	}

	if ctx.Config().IsEnvTrue("RBE_CXX_LINKS") {

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

		rule = ldRE

		args["implicitOutputs"] = strings.Join(implicitOutputs.Strings(), ",")

		args["implicitInputs"] = strings.Join(deps.Strings(), ",")
@@ -789,7 +789,7 @@ func TransformDumpToLinkedDump(ctx android.ModuleContext, sAbiDumps android.Path 
		"arch":                ctx.Arch().ArchType.Name,

		"exportedHeaderFlags": exportedHeaderFlags,

	}

	if ctx.Config().IsEnvTrue("RBE_ABI_LINKER") {

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

		rule = sAbiLinkRE

		rbeImplicits := implicits.Strings()

		for _, p := range strings.Split(exportedHeaderFlags, " ") {
@@ -912,7 +912,7 @@ func TransformObjsToObj(ctx android.ModuleContext, objFiles android.Paths, 
		"ldCmd":   ldCmd,

		"ldFlags": flags.globalLdFlags + " " + flags.localLdFlags,

	}

	if ctx.Config().IsEnvTrue("RBE_CXX_LINKS") {

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

		rule = partialLdRE

		args["inCommaList"] = strings.Join(objFiles.Strings(), ",")

		args["implicitInputs"] = strings.Join(deps.Strings(), ",")

java/app_builder.go

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ func SignAppPackage(ctx android.ModuleContext, signedApk android.WritablePath, u 
		"certificates": strings.Join(certificateArgs, " "),

		"flags":        strings.Join(flags, " "),

	}

	if ctx.Config().IsEnvTrue("RBE_SIGNAPK") {

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

		rule = SignapkRE

		args["implicits"] = strings.Join(deps.Strings(), ",")

		args["outCommaList"] = strings.Join(outputFiles.Strings(), ",")
@@ -241,7 +241,7 @@ func TransformJniLibsToJar(ctx android.ModuleContext, outputFile android.Writabl 
	args := map[string]string{

		"jarArgs": strings.Join(proptools.NinjaAndShellEscapeList(jarArgs), " "),

	}

	if ctx.Config().IsEnvTrue("RBE_ZIP") {

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

		rule = zipRE

		args["implicits"] = strings.Join(deps.Strings(), ",")

	}

java/builder.go

+3 −3
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android. 
		"outDir":        android.PathForModuleOut(ctx, "turbine", "classes").String(),

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

	}

	if ctx.Config().IsEnvTrue("RBE_TURBINE") {

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

		rule = turbineRE

		args["implicits"] = strings.Join(deps.Strings(), ",")

	}
@@ -452,7 +452,7 @@ func transformJavaToClasses(ctx android.ModuleContext, outputFile android.Writab 
		annoDir = filepath.Join(shardDir, annoDir)

	}

	rule := javac

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

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

		rule = javacRE

	}

	ctx.Build(pctx, android.BuildParams{
@@ -480,7 +480,7 @@ func TransformResourcesToJar(ctx android.ModuleContext, outputFile android.Writa 
	jarArgs []string, deps android.Paths) {



	rule := jar

	if ctx.Config().IsEnvTrue("RBE_JAR") {

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

		rule = jarRE

	}

	ctx.Build(pctx, android.BuildParams{

java/dex.go

+2 −2
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ func (d *dexer) compileDex(ctx android.ModuleContext, flags javaBuilderFlags, mi 
			"outUsageZip": proguardUsageZip.String(),

			"outDir":      outDir.String(),

		}

		if ctx.Config().IsEnvTrue("RBE_R8") {

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

			rule = r8RE

			args["implicits"] = strings.Join(r8Deps.Strings(), ",")

		}
@@ -304,7 +304,7 @@ func (d *dexer) compileDex(ctx android.ModuleContext, flags javaBuilderFlags, mi 
	} else {

		d8Flags, d8Deps := d8Flags(flags)

		rule := d8

		if ctx.Config().IsEnvTrue("RBE_D8") {

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

			rule = d8RE

		}

		ctx.Build(pctx, android.BuildParams{