diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-05-21 21:00:26 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2015-05-27 14:44:30 -0700 |
| commit | e819398870b185440e3d3fd088cdcb14184fdf64 (patch) | |
| tree | 844d6ffe2ad1892601cfe7b86b832c29f3f6384a | |
| parent | 899717ff2ac15357411217d7d568a495a07822ca (diff) | |
| download | build-e819398870b185440e3d3fd088cdcb14184fdf64.zip build-e819398870b185440e3d3fd088cdcb14184fdf64.tar.gz build-e819398870b185440e3d3fd088cdcb14184fdf64.tar.bz2 | |
Both ext4 and f2fs binaries for adoptable storage.
New adoptable storage feature can format media as either ext4 or
f2fs, so bring in both sets of binaries for typical products.
Bug: 20275581
Change-Id: I85380cbc8c06c958b66db879f63447ddac124cbf
| -rw-r--r-- | target/product/core_minimal.mk | 7 | ||||
| -rw-r--r-- | target/product/emulator.mk | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index 022462e..27c10af 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -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 += \ diff --git a/target/product/emulator.mk b/target/product/emulator.mk index d9ff62e..50c43e0 100644 --- a/target/product/emulator.mk +++ b/target/product/emulator.mk @@ -42,14 +42,12 @@ PRODUCT_PACKAGES += \ gps.goldfish \ fingerprint.goldfish \ sensors.goldfish \ - e2fsck \ audio.primary.goldfish \ vibrator.goldfish \ power.goldfish \ fingerprint.ranchu \ sensors.ranchu - PRODUCT_COPY_FILES += \ device/generic/goldfish/fstab.goldfish:root/fstab.goldfish \ device/generic/goldfish/init.goldfish.rc:root/init.goldfish.rc \ |