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

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

Resolve merge conflicts of "Check UseRBE is set before replacing any template... 

Resolve merge conflicts of "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c03 am: 4e2977ee am: e78212a5 am: a510a2db

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

Change-Id: I181bb735aaf2c3c51982f3f0d50497e3ba5184be
parents 9ee45ad0 a510a2db

cc/builder.go

+3 −3
Original line number Diff line number Diff line
@@ -584,7 +584,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{
@@ -700,7 +700,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(), ",")
@@ -858,7 +858,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/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -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{

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{