resolved conflicts for merge of 064a4562
to master
Change-Id: I795e2b6ba842541fc941c1da396734198a12ea72
This commit is contained in:
commit
ff83c8593e
|
@ -921,8 +921,8 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \
|
|||
$(HOST_OUT_EXECUTABLES)/mkuserimg.sh \
|
||||
$(HOST_OUT_EXECUTABLES)/genext2fs \
|
||||
$(HOST_OUT_EXECUTABLES)/tune2fs \
|
||||
$(HOST_OUT_EXECUTABLES)/e2fsck
|
||||
|
||||
$(HOST_OUT_EXECUTABLES)/e2fsck \
|
||||
$(HOST_OUT_EXECUTABLES)/make_ext4fs
|
||||
|
||||
.PHONY: otatools
|
||||
otatools: $(OTATOOLS)
|
||||
|
|
Loading…
Reference in New Issue