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

Commit 9f6cbaca authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix missing deps found through RBE"

parents de8b140b 724ab5d5

cc/builder.go

+2 −1
Original line number Diff line number Diff line
@@ -764,7 +764,7 @@ func TransformSharedObjectToToc(ctx android.ModuleContext, inputFile android.Pat 


// Generate a rule for compiling multiple .o files to a .o using ld partial linking

func TransformObjsToObj(ctx android.ModuleContext, objFiles android.Paths,

	flags builderFlags, outputFile android.WritablePath) {

	flags builderFlags, outputFile android.WritablePath, deps android.Paths) {



	ldCmd := "${config.ClangBin}/clang++"
@@ -773,6 +773,7 @@ func TransformObjsToObj(ctx android.ModuleContext, objFiles android.Paths, 
		Description: "link " + outputFile.Base(),

		Output:      outputFile,

		Inputs:      objFiles,

		Implicits:   deps,

		Args: map[string]string{

			"ldCmd":   ldCmd,

			"ldFlags": flags.ldFlags,

cc/linker.go

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ var ( 
	gen_sorted_bss_symbols = pctx.AndroidStaticRule("gen_sorted_bss_symbols",

		blueprint.RuleParams{

			Command:     "CROSS_COMPILE=$crossCompile $genSortedBssSymbolsPath ${in} ${out}",

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

			CommandDeps: []string{"$genSortedBssSymbolsPath", "${crossCompile}nm"},

		},

		"crossCompile")

)

cc/object.go

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ func (object *objectLinker) link(ctx ModuleContext, 
			output = input

		}



		TransformObjsToObj(ctx, objs.objFiles, builderFlags, output)

		TransformObjsToObj(ctx, objs.objFiles, builderFlags, output, flags.LdFlagsDeps)

	}



	ctx.CheckbuildFile(outputFile)