openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix missing deps found through RBE"

This commit is contained in:
Treehugger Robot 2019-09-19 20:34:05 +00:00 committed by Gerrit Code Review
parent de8b140bf6 724ab5d5f7
commit 9f6cbaca21
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cc/builder.go
View File

@ -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 // Generate a rule for compiling multiple .o files to a .o using ld partial linking
func TransformObjsToObj(ctx android.ModuleContext, objFiles android.Paths, 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++" ldCmd := "${config.ClangBin}/clang++"
@ -773,6 +773,7 @@ func TransformObjsToObj(ctx android.ModuleContext, objFiles android.Paths,
Description: "link " + outputFile.Base(), Description: "link " + outputFile.Base(),
Output: outputFile, Output: outputFile,
Inputs: objFiles, Inputs: objFiles,
Implicits: deps,
Args: map[string]string{ Args: map[string]string{
"ldCmd": ldCmd, "ldCmd": ldCmd,
"ldFlags": flags.ldFlags, "ldFlags": flags.ldFlags,

2
cc/linker.go
View File

@ -491,7 +491,7 @@ var (
gen_sorted_bss_symbols = pctx.AndroidStaticRule("gen_sorted_bss_symbols", gen_sorted_bss_symbols = pctx.AndroidStaticRule("gen_sorted_bss_symbols",
blueprint.RuleParams{ blueprint.RuleParams{
Command: "CROSS_COMPILE=$crossCompile $genSortedBssSymbolsPath ${in} ${out}", Command: "CROSS_COMPILE=$crossCompile $genSortedBssSymbolsPath ${in} ${out}",
CommandDeps: []string{"$genSortedBssSymbolsPath"}, CommandDeps: []string{"$genSortedBssSymbolsPath", "${crossCompile}nm"},
}, },
"crossCompile") "crossCompile")
) )

2
cc/object.go
View File

@ -123,7 +123,7 @@ func (object *objectLinker) link(ctx ModuleContext,
output = input output = input
} }
TransformObjsToObj(ctx, objs.objFiles, builderFlags, output) TransformObjsToObj(ctx, objs.objFiles, builderFlags, output, flags.LdFlagsDeps)
} }
ctx.CheckbuildFile(outputFile) ctx.CheckbuildFile(outputFile)