Merge "Don't expect depfile from .s files" (9b84d34b) · Commits · e / os / android_build_soong

cc/builder.go

+13 −2

Original line number	Diff line number	Diff line
		@@ -55,6 +55,13 @@ var (
		},
		"ccCmd", "cFlags")

		ccNoDeps = pctx.AndroidGomaStaticRule("ccNoDeps",
		blueprint.RuleParams{
		Command: "$relPwd ${config.CcWrapper}$ccCmd -c $cFlags -o $out $in",
		CommandDeps: []string{"$ccCmd"},
		},
		"ccCmd", "cFlags")

		ld = pctx.AndroidStaticRule("ld",
		blueprint.RuleParams{
		Command: "$ldCmd ${crtBegin} @${out}.rsp " +
		@@ -383,9 +390,13 @@ func TransformSourceToObj(ctx android.ModuleContext, subdir string, srcFiles and
		tidy := flags.tidy
		coverage := flags.coverage
		dump := flags.sAbiDump
		rule := cc

		switch srcFile.Ext() {
		case ".S", ".s":
		case ".s":
		rule = ccNoDeps
		fallthrough
		case ".S":
		ccCmd = "clang"
		moduleCflags = asflags
		tidy = false
		@@ -416,7 +427,7 @@ func TransformSourceToObj(ctx android.ModuleContext, subdir string, srcFiles and
		}

		ctx.Build(pctx, android.BuildParams{
		Rule: cc,
		Rule: rule,
		Description: ccDesc + " " + srcFile.Rel(),
		Output: objFile,
		ImplicitOutputs: implicitOutputs,