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

Commit afa3c5f2 authored by Ramy Medhat's avatar Ramy Medhat Committed by Kousik Kumar
Browse files

[DO NOT MERGE] Add support for remotely executing header-abi-dumper actions. 

Bug: b/166182389
Test: built with and without RBE_ABI_DUMPER set.
Change-Id: Ie752c07325453076d191813eaa50da03e3a0c2d8
Merged-In: Ie752c07325453076d191813eaa50da03e3a0c2d8
parent c726ab53

cc/builder.go

+31 −10
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ package cc 


import (

	"fmt"

	"os"

	"path/filepath"

	"runtime"

	"strconv"
@@ -44,6 +45,14 @@ var ( 
	}

)



func absSrcDir() string {

	dir, err := os.Getwd()

	if err != nil {

		panic(fmt.Errorf("failed to get working directory: %s", err))

	}

	return dir

}



var (

	pctx = android.NewPackageContext("android/soong/cc")
@@ -65,7 +74,7 @@ var ( 


	ld, ldRE = remoteexec.StaticRules(pctx, "ld",

		blueprint.RuleParams{

			Command: "$ldCmd ${crtBegin} @${out}.rsp " +

			Command: "$reTemplate$ldCmd ${crtBegin} @${out}.rsp " +

				"${libFlags} ${crtEnd} -o ${out} ${ldFlags}",

			CommandDeps:    []string{"$ldCmd"},

			Rspfile:        "${out}.rsp",
@@ -73,7 +82,8 @@ var ( 
			// clang -Wl,--out-implib doesn't update its output file if it hasn't changed.

			Restat: true,

		},

		&remoteexec.REParams{Labels: map[string]string{"type": "link", "tool": "clang"},

		&remoteexec.REParams{

			Labels:          map[string]string{"type": "link", "tool": "clang"},

			ExecStrategy:    "${config.RECXXLinksExecStrategy}",

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

			RSPFile:         "${out}.rsp",
@@ -86,11 +96,12 @@ var ( 
		blueprint.RuleParams{

			// Without -no-pie, clang 7.0 adds -pie to link Android files,

			// but -r and -pie cannot be used together.

			Command:     "$ldCmd -nostdlib -no-pie -Wl,-r ${in} -o ${out} ${ldFlags}",

			Command:     "$reTemplate$ldCmd -nostdlib -no-pie -Wl,-r ${in} -o ${out} ${ldFlags}",

			CommandDeps: []string{"$ldCmd"},

		}, &remoteexec.REParams{

			Labels:          map[string]string{"type": "link", "tool": "clang"},

			ExecStrategy: "${config.RECXXLinksExecStrategy}", Inputs: []string{"$inCommaList"},

			ExecStrategy:    "${config.RECXXLinksExecStrategy}",

			Inputs:          []string{"$inCommaList"},

			OutputFiles:     []string{"${out}"},

			ToolchainInputs: []string{"$ldCmd"},

			Platform:        map[string]string{remoteexec.PoolKey: "${config.RECXXLinksPool}"},
@@ -202,12 +213,18 @@ var ( 
	_ = pctx.SourcePathVariable("sAbiDumper", "prebuilts/clang-tools/${config.HostPrebuiltTag}/bin/header-abi-dumper")



	// -w has been added since header-abi-dumper does not need to produce any sort of diagnostic information.

	sAbiDump = pctx.AndroidStaticRule("sAbiDump",

	sAbiDump, sAbiDumpRE = remoteexec.StaticRules(pctx, "sAbiDump",

		blueprint.RuleParams{

			Command:     "rm -f $out && $sAbiDumper -o ${out} $in $exportDirs -- $cFlags -w -isystem prebuilts/clang-tools/${config.HostPrebuiltTag}/clang-headers",

			Command:     "rm -f $out && $reTemplate$sAbiDumper -o ${out} $in $exportDirs -- $cFlags -w -isystem prebuilts/clang-tools/${config.HostPrebuiltTag}/clang-headers",

			CommandDeps: []string{"$sAbiDumper"},

		}, &remoteexec.REParams{

			Labels:       map[string]string{"type": "abi-dump", "tool": "header-abi-dumper"},

			ExecStrategy: "${config.REAbiDumperExecStrategy}",

			Platform: map[string]string{

				remoteexec.PoolKey:      "${config.RECXXPool}",

				"InputRootAbsolutePath": absSrcDir(),

			},

		"cFlags", "exportDirs")

		}, []string{"cFlags", "exportDirs"}, nil)



	_ = pctx.SourcePathVariable("sAbiLinker", "prebuilts/clang-tools/${config.HostPrebuiltTag}/bin/header-abi-linker")
@@ -499,8 +516,12 @@ func TransformSourceToObj(ctx android.ModuleContext, subdir string, srcFiles and 
			sAbiDumpFile := android.ObjPathWithExt(ctx, subdir, srcFile, "sdump")

			sAbiDumpFiles = append(sAbiDumpFiles, sAbiDumpFile)



			dumpRule := sAbiDump

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

				dumpRule = sAbiDumpRE

			}

			ctx.Build(pctx, android.BuildParams{

				Rule:        sAbiDump,

				Rule:        dumpRule,

				Description: "header-abi-dumper " + srcFile.Rel(),

				Output:      sAbiDumpFile,

				Input:       srcFile,

cc/config/global.go

+2 −0
Original line number Diff line number Diff line
@@ -234,8 +234,10 @@ func init() { 
		return ""

	})



	pctx.VariableFunc("RECXXPool", envOverrideFunc("RBE_CXX_POOL", remoteexec.DefaultPool))

	pctx.VariableFunc("RECXXLinksPool", envOverrideFunc("RBE_CXX_LINKS_POOL", remoteexec.DefaultPool))

	pctx.VariableFunc("RECXXLinksExecStrategy", envOverrideFunc("RBE_CXX_LINKS_EXEC_STRATEGY", remoteexec.LocalExecStrategy))

	pctx.VariableFunc("REAbiDumperExecStrategy", envOverrideFunc("RBE_ABI_DUMPER_EXEC_STRATEGY", remoteexec.LocalExecStrategy))

}



var HostPrebuiltTag = pctx.VariableConfigMethod("HostPrebuiltTag", android.Config.PrebuiltOS)

remoteexec/remoteexec.go

+2 −1
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ func (r *REParams) Template() string { 
// locally executable rule and the second rule is a remotely executable rule.

func StaticRules(ctx android.PackageContext, name string, ruleParams blueprint.RuleParams, reParams *REParams, commonArgs []string, reArgs []string) (blueprint.Rule, blueprint.Rule) {

	ruleParamsRE := ruleParams

	ruleParamsRE.Command = reParams.Template() + ruleParamsRE.Command

	ruleParams.Command = strings.ReplaceAll(ruleParams.Command, "$reTemplate", "")

	ruleParamsRE.Command = strings.ReplaceAll(ruleParamsRE.Command, "$reTemplate", reParams.Template())



	return ctx.AndroidStaticRule(name, ruleParams, commonArgs...),

		ctx.AndroidRemoteStaticRule(name+"RE", android.RemoteRuleSupports{RBE: true}, ruleParamsRE, append(commonArgs, reArgs...)...)