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

Commit e95d555c authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am c79068be: am c2fb6e10: Merge "Both ext4 and f2fs binaries for adoptable storage." into mnc-dev

* commit 'c79068be':
  Both ext4 and f2fs binaries for adoptable storage.
parents 9dd19245 c79068be
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -102,6 +102,13 @@ PRODUCT_SYSTEM_SERVER_JARS := \
    ethernet-service \
    wifi-service

# Adoptable external storage supports both ext4 and f2fs
PRODUCT_PACKAGES += \
    e2fsck \
    make_ext4fs \
    fsck.f2fs \
    make_f2fs \

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
    ro.zygote=zygote32
PRODUCT_COPY_FILES += \
+0 −2
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ PRODUCT_PACKAGES += \
    gps.goldfish \
    fingerprint.goldfish \
    sensors.goldfish \
    e2fsck \
    audio.primary.goldfish \
    vibrator.goldfish \
    power.goldfish \
@@ -50,7 +49,6 @@ PRODUCT_PACKAGES += \
    fingerprintd \
    sensors.ranchu


PRODUCT_COPY_FILES += \
    device/generic/goldfish/fstab.goldfish:root/fstab.goldfish \
    device/generic/goldfish/init.goldfish.rc:root/init.goldfish.rc \