diff options
| author | 2024-12-20 16:24:46 -0800 | |
|---|---|---|
| committer | 2024-12-20 16:24:46 -0800 | |
| commit | fc11f43e02d7e3d1d14a1c93773003af6bc46dcc (patch) | |
| tree | 244200d7f7da4f0b0b31e88c54280a35f6e7de2e | |
| parent | e3ccbd5f2bd497fd00889e031289d3d78321f47f (diff) | |
| parent | 8f8ca3991a8b0ef6338ed5aa4a6243ff2e86fc46 (diff) | |
Merge "Clean up the rerun script." into main am: a17154f1d1 am: 8f8ca3991a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3426694
Change-Id: I80bcca73853494666e3e0af7a2de359b0e06763f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rwxr-xr-x | ravenwood/scripts/extract-last-soong-commands.py | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/ravenwood/scripts/extract-last-soong-commands.py b/ravenwood/scripts/extract-last-soong-commands.py index c08d4aa799a5..0629b77029e0 100755 --- a/ravenwood/scripts/extract-last-soong-commands.py +++ b/ravenwood/scripts/extract-last-soong-commands.py @@ -32,7 +32,7 @@ re_command = re.compile(r''' ^\[.*?\] \s* (.*) ''', re.X) HEADER = r'''#!/bin/bash set -e # Stop on a failed command - +set -x # Print command line before executing cd "${ANDROID_BUILD_TOP:?}" ''' @@ -65,16 +65,8 @@ def main(args): command = m.groups()[0] count += 1 - out.write(f'### Command {count} ========\n') - - # Show the full command line before executing it. - out.write('#echo ' + shlex.quote(command) + '\n') - out.write('\n') - - # Execute the command. - out.write('#' + command + '\n') - - out.write('\n') + out.write(f'### Command {count} ========\n\n') + out.write('#' + command + '\n\n') continue |