Merge "Replace make_ext4fs with mke2fs" am: bd532fbf2e

am: 3f2bf55726

Change-Id: I413967d1e6f479d8899e906aa4a5d597107c77de
This commit is contained in:
Jin Qian 2017-11-03 18:03:20 +00:00 committed by android-build-merger
commit a08e72372e
3 changed files with 3 additions and 4 deletions

View file

@ -2106,7 +2106,6 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \
$(HOST_OUT_JAVA_LIBRARIES)/signapk.jar \ $(HOST_OUT_JAVA_LIBRARIES)/signapk.jar \
$(HOST_OUT_JAVA_LIBRARIES)/BootSignature.jar \ $(HOST_OUT_JAVA_LIBRARIES)/BootSignature.jar \
$(HOST_OUT_JAVA_LIBRARIES)/VeritySigner.jar \ $(HOST_OUT_JAVA_LIBRARIES)/VeritySigner.jar \
$(HOST_OUT_EXECUTABLES)/make_ext4fs \
$(HOST_OUT_EXECUTABLES)/mkuserimg.sh \ $(HOST_OUT_EXECUTABLES)/mkuserimg.sh \
$(HOST_OUT_EXECUTABLES)/mke2fs \ $(HOST_OUT_EXECUTABLES)/mke2fs \
$(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs.sh \ $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs.sh \

View file

@ -76,7 +76,7 @@ PRODUCT_PACKAGES += \
libwebviewchromium_plat_support \ libwebviewchromium_plat_support \
libwilhelm \ libwilhelm \
logd \ logd \
make_ext4fs \ mke2fs \
e2fsck \ e2fsck \
resize2fs \ resize2fs \
tune2fs \ tune2fs \
@ -134,7 +134,7 @@ PRODUCT_SYSTEM_SERVER_APPS += \
# Adoptable external storage supports both ext4 and f2fs # Adoptable external storage supports both ext4 and f2fs
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
e2fsck \ e2fsck \
make_ext4fs \ mke2fs \
fsck.f2fs \ fsck.f2fs \
make_f2fs \ make_f2fs \

View file

@ -70,7 +70,7 @@ PRODUCT_PACKAGES += \
libwilhelm \ libwilhelm \
libdrmframework_jni \ libdrmframework_jni \
libdrmframework \ libdrmframework \
make_ext4fs \ mke2fs \
e2fsck \ e2fsck \
resize2fs \ resize2fs \
tune2fs \ tune2fs \