Merge "Move the impl of run_tool_with_logging into shell_utils.sh" into main am: df1ba7c5ff

Original change: https://android-review.googlesource.com/c/platform/build/+/3109346

Change-Id: Ia92e745c9f0b861972979e76cd46ef1c1add28be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Zhuoyao Zhang
2024-06-08 01:16:20 +00:00
committed by Automerger Merge Worker

View File

@@ -126,4 +126,27 @@ function _wrap_build()
}
function log_tool_invocation()
{
if [[ -z $ANDROID_TOOL_LOGGER ]]; then
return
fi
LOG_TOOL_TAG=$1
LOG_START_TIME=$(date +%s.%N)
trap '
exit_code=$?;
# Remove the trap to prevent duplicate log.
trap - EXIT;
$ANDROID_TOOL_LOGGER \
--tool_tag="${LOG_TOOL_TAG}" \
--start_timestamp="${LOG_START_TIME}" \
--end_timestamp="$(date +%s.%N)" \
--tool_args="$*" \
--exit_code="${exit_code}" \
${ANDROID_TOOL_LOGGER_EXTRA_ARGS} \
> /dev/null 2>&1 &
exit ${exit_code}
' SIGINT SIGTERM SIGQUIT EXIT
}