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

* commit 'c79068be5c90aefedcb2e171e8700eace4e8f05c':
  Both ext4 and f2fs binaries for adoptable storage.
This commit is contained in:
Jeff Sharkey 2015-05-29 05:15:59 +00:00 committed by Android Git Automerger
commit e95d555c12
2 changed files with 7 additions and 2 deletions

View file

@ -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 += \

View file

@ -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 \