Merge "Add merge_ota to otatools" am: 1da7ff838b
am: 899fc1b715
am: d478626f89
am: b22f49ba48
Original change: https://android-review.googlesource.com/c/platform/build/+/2587126 Change-Id: I42eb7214772cc49197f96b26a5fcb19c8eb86f95 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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 \
|
||||||
|
Reference in New Issue
Block a user