diff options
| author | Cole Faust <colefaust@google.com> | 2024-01-09 18:45:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-09 18:45:49 +0000 |
| commit | 007cf5581e75bc1ca2e2db72592083e739de2393 (patch) | |
| tree | cdd6142601430f432c921abce3744f4009ed1a4f | |
| parent | b43565659a887e2b559578aaae9fd416d7438d75 (diff) | |
| parent | 5eaf8f7a6df9f7fbc2fcbdaef7c41b5b65428768 (diff) | |
| download | hidl-007cf5581e75bc1ca2e2db72592083e739de2393.tar.gz | |
Simplify depfile handling am: 5eaf8f7a6d
Original change: https://android-review.googlesource.com/c/platform/system/tools/hidl/+/2901079
Change-Id: Ia32296fc80f1a5c40c1d32b8d59deabc762f058e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | build/hidl_interface.go | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/build/hidl_interface.go b/build/hidl_interface.go index ab8c52a7..ace42245 100644 --- a/build/hidl_interface.go +++ b/build/hidl_interface.go @@ -39,22 +39,22 @@ var ( intermediatesDir = pctx.IntermediatesPathVariable("intermediatesDir", "") hidlRule = pctx.StaticRule("hidlRule", blueprint.RuleParams{ - Depfile: "${depfile}", + Depfile: "${out}.d", Deps: blueprint.DepsGCC, - Command: "rm -rf ${genDir} && ${hidl} -R -p . -d ${depfile} -o ${genDir} -L ${language} ${options} ${fqName}", + Command: "rm -rf ${genDir} && ${hidl} -R -p . -d ${out}.d -o ${genDir} -L ${language} ${options} ${fqName}", CommandDeps: []string{"${hidl}"}, Description: "HIDL ${language}: ${in} => ${out}", - }, "depfile", "fqName", "genDir", "language", "options") + }, "fqName", "genDir", "language", "options") hidlSrcJarRule = pctx.StaticRule("hidlSrcJarRule", blueprint.RuleParams{ - Depfile: "${depfile}", + Depfile: "${out}.d", Deps: blueprint.DepsGCC, Command: "rm -rf ${genDir} && " + - "${hidl} -R -p . -d ${depfile} -o ${genDir}/srcs -L ${language} ${options} ${fqName} && " + + "${hidl} -R -p . -d ${out}.d -o ${genDir}/srcs -L ${language} ${options} ${fqName} && " + "${soong_zip} -o ${genDir}/srcs.srcjar -C ${genDir}/srcs -D ${genDir}/srcs", CommandDeps: []string{"${hidl}", "${soong_zip}"}, Description: "HIDL ${language}: ${in} => srcs.srcjar", - }, "depfile", "fqName", "genDir", "language", "options") + }, "fqName", "genDir", "language", "options") lintRule = pctx.StaticRule("lintRule", blueprint.RuleParams{ Command: "rm -f ${output} && touch ${output} && ${lint} -j -e -R -p . ${options} ${fqName} > ${output}", @@ -316,7 +316,6 @@ func (g *hidlGenRule) GenerateAndroidBuildActions(ctx android.ModuleContext) { Output: g.genOutputs[0], ImplicitOutputs: g.genOutputs[1:], Args: map[string]string{ - "depfile": g.genOutputs[0].String() + ".d", "genDir": g.genOutputDir.String(), "fqName": g.properties.FqName, "language": g.properties.Language, |