diff options
| author | Cole Faust <colefaust@google.com> | 2023-05-09 01:32:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-09 01:32:22 +0000 |
| commit | 4cb24e0cb4105d4f8feb1d13dc958054903bb408 (patch) | |
| tree | 6e04f7d0056966a153bd0b262793e8e57f2e1a81 | |
| parent | 98b89c632bd431d267cc8c82109fc4bfb1ee8e3d (diff) | |
| parent | fbb752543e5a8961d102654a02f203abf2c4d3fe (diff) | |
| download | treble-4cb24e0cb4105d4f8feb1d13dc958054903bb408.tar.gz | |
Update usages of ckati_stamp_dump am: 5cb38ac7d1 am: 5fe8783807 am: 1997f6563c am: fbb752543e
Original change: https://android-review.googlesource.com/c/platform/tools/treble/+/2582072
Change-Id: Ie1230619667804cafe4ad9e6e958d1a14fd06f0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | split/manifest_split.py | 5 | ||||
| -rw-r--r-- | split/manifest_split_test.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/split/manifest_split.py b/split/manifest_split.py index 5114f24..7dc71d2 100644 --- a/split/manifest_split.py +++ b/split/manifest_split.py @@ -314,7 +314,7 @@ def get_ninja_inputs(ninja_binary, ninja_build_file, modules): def get_kati_makefiles(kati_stamp_file, overlays): """Returns the set of makefile paths from the kati stamp file. - Uses the ckati_stamp_dump prebuilt binary. + Uses the ckati prebuilt binary. Also includes symlink sources in the resulting set for any makefiles that are symlinks. @@ -326,7 +326,8 @@ def get_kati_makefiles(kati_stamp_file, overlays): # Get a set of all makefiles that were parsed by Kati during the build. makefiles = set( subprocess.check_output([ - "prebuilts/build-tools/linux-x86/bin/ckati_stamp_dump", + "prebuilts/build-tools/linux-x86/bin/ckati", + "--dump_stamp_tool", "--files", kati_stamp_file, ]).decode().strip("\n").split("\n")) diff --git a/split/manifest_split_test.py b/split/manifest_split_test.py index d9c6f76..c07c870 100644 --- a/split/manifest_split_test.py +++ b/split/manifest_split_test.py @@ -221,7 +221,7 @@ class ManifestSplitTest(unittest.TestCase): # (The Kati stamp file does not resolve symlink sources.) makefiles.append(symlink_dest) - # Mock the output of ckati_stamp_dump: + # Mock the output of ckati --dump_stamp_tool: mock_check_output.return_value = '\n'.join(makefiles).encode() kati_makefiles = manifest_split.get_kati_makefiles( |