| commit | 98c4d9e94cdfff25c8b7cdd55fcf9d6d0ed8956a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Oct 26 14:35:21 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 26 14:35:21 2023 +0000 |
| tree | 9c89d8bbc7ea5da44c735b8a3a1050bba46da645 | |
| parent | 721379d1e850d793e1df261f967db053fe30ac52 [diff] | |
| parent | 144b47b613924322de43ad8f23f7c12721b44b42 [diff] |
Merge "Replace `--dex-api` with `signature-to-dex` instead" into main am: 15181c7139 am: e43b4366a2 am: 144b47b613 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2805633 Change-Id: Ifdadfbf54d9f36aa85d56e8d9198d6e7b38bf5fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/api/gen_combined_removed_dex.sh b/api/gen_combined_removed_dex.sh index 71f366a..e0153f7 100755 --- a/api/gen_combined_removed_dex.sh +++ b/api/gen_combined_removed_dex.sh
@@ -6,6 +6,6 @@ # Convert each removed.txt to the "dex format" equivalent, and print all output. for f in "$@"; do - "$metalava_path" "$f" --dex-api "${tmp_dir}/tmp" + "$metalava_path" signature-to-dex "$f" "${tmp_dir}/tmp" cat "${tmp_dir}/tmp" done