Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a08e7237 authored by Jin Qian's avatar Jin Qian Committed by android-build-merger
Browse files

Merge "Replace make_ext4fs with mke2fs" am: bd532fbf 

am: 3f2bf557

Change-Id: I413967d1e6f479d8899e906aa4a5d597107c77de
parents b26af8af 3f2bf557

core/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -2106,7 +2106,6 @@ OTATOOLS := $(HOST_OUT_EXECUTABLES)/minigzip \ 
  $(HOST_OUT_JAVA_LIBRARIES)/signapk.jar \

  $(HOST_OUT_JAVA_LIBRARIES)/BootSignature.jar \

  $(HOST_OUT_JAVA_LIBRARIES)/VeritySigner.jar \

  $(HOST_OUT_EXECUTABLES)/make_ext4fs \

  $(HOST_OUT_EXECUTABLES)/mkuserimg.sh \

  $(HOST_OUT_EXECUTABLES)/mke2fs \

  $(HOST_OUT_EXECUTABLES)/mkuserimg_mke2fs.sh \

target/product/core_minimal.mk

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ PRODUCT_PACKAGES += \ 
    libwebviewchromium_plat_support \

    libwilhelm \

    logd \

    make_ext4fs \

    mke2fs \

    e2fsck \

    resize2fs \

    tune2fs \
@@ -134,7 +134,7 @@ PRODUCT_SYSTEM_SERVER_APPS += \ 
# Adoptable external storage supports both ext4 and f2fs

PRODUCT_PACKAGES += \

    e2fsck \

    make_ext4fs \

    mke2fs \

    fsck.f2fs \

    make_f2fs \

target/product/core_tiny.mk

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ PRODUCT_PACKAGES += \ 
    libwilhelm \

    libdrmframework_jni \

    libdrmframework \

    make_ext4fs \

    mke2fs \

    e2fsck \

    resize2fs \

    tune2fs \