Fix a bug in run_tool_with_logging script
Fix the case when call a tool with run_tool_with_logging with a single
arg start with -- (e.g. adb --help), make sure when we pass that arg
to the logger, it treat it as the value for the --tool_args option
instead of a separate option
Test: atest run_tool_with_logging_test
Test: manually run source build/envsetup.sh and run adb --help and check
the event log is sent to clearcut. Tested with both bash and zsh
Bug: 341382247
Change-Id: I1e09907f267b453cb62876e171064daa021e3d91
diff --git a/envsetup.sh b/envsetup.sh
index b20c83f..640ed14 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -847,11 +847,11 @@
# Remove the trap to prevent duplicate log.
trap - EXIT;
"${logger}" \
- --tool_tag "${tool_tag}" \
- --start_timestamp "${start_time}" \
- --end_timestamp "$(date +%s.%N)" \
- --tool_args "$*" \
- --exit_code "${exit_code}" \
+ --tool_tag="${tool_tag}" \
+ --start_timestamp="${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}