Merge "Add merge_ota to otatools" am: 1da7ff838b am: 899fc1b715 am: d478626f89

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

Change-Id: I1014285c3c27c49cf782e9531d6b8b3ca7c2f6cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-15 23:37:22 +00:00
committed by Automerger Merge Worker

View File

@@ -5217,6 +5217,7 @@ INTERNAL_OTATOOLS_MODULES := \
lz4 \ lz4 \
make_f2fs \ make_f2fs \
make_f2fs_casefold \ make_f2fs_casefold \
merge_ota \
merge_target_files \ merge_target_files \
minigzip \ minigzip \
mk_combined_img \ mk_combined_img \