commit 6579539668612fb825637425b3d4ead48c94e555
author Zhuoyao Zhang <zhuoyao@google.com> Sat Jun 08 01:30:48 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jun 08 01:30:48 2024 +0000
tree ef84866d18b7baa1c114ca918cad9bccaecee12e
parent c75273461dd480c8dc8a6b49f983d3b6b07b87d7
parent 99d5a16cf7a741376763f1a0ebd4869e602b4fd9

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

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

Change-Id: Id674e385717943f4fdc23744406055a9b8ee237c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

shell_utils.sh

diff --git a/shell_utils.sh b/shell_utils.sh
index 450bb83..86f3f49 100644
--- a/shell_utils.sh
+++ b/shell_utils.sh
@@ -126,4 +126,27 @@
 }
 
 
+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
+}