From 39c88e6ba39cc30a5e685d5d93f86bb1845fa98c Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Thu, 20 Mar 2025 10:15:24 -0700 Subject: Fix depfile in otatoolsPackageCertRule The depfile dependencies must all be on the same line as the output file. (or escape the newlines with backslashes) Bug: 395988167 Test: m otatools_package_cert_files(-soong if on soong+make builds), observe it builds. Rerun command, observe it doesn't build. touch packages/modules/adb/apex/com.android.adbd.avbpubkey and rerun command, observe it builds again. Change-Id: I2b2ee397b406488797e16b04880d0396784029fe --- android/otatools_package_cert_zip.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/otatools_package_cert_zip.go b/android/otatools_package_cert_zip.go index 03265cad3..3a654cfe5 100644 --- a/android/otatools_package_cert_zip.go +++ b/android/otatools_package_cert_zip.go @@ -39,7 +39,7 @@ func OtatoolsPackageFactory() Module { var ( otatoolsPackageCertRule = pctx.AndroidStaticRule("otatools_package_cert_files", blueprint.RuleParams{ - Command: "echo $out: > ${out}.d && cat $in >> ${out}.d && ${SoongZipCmd} -o $out -l $in", + Command: "echo '$out : ' $$(cat $in) > ${out}.d && ${SoongZipCmd} -o $out -l $in", CommandDeps: []string{"${SoongZipCmd}"}, Depfile: "${out}.d", Description: "Zip otatools-package cert files", -- cgit v1.2.3-59-g8ed1b