diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-05-28 19:54:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-28 19:54:17 +0000 |
| commit | c2fb6e107d81e50a58fe25073f490b9dd48b31e2 (patch) | |
| tree | 2873ab7048d16f0d9bbcd796024ff51b3bf07dca | |
| parent | d1f158898815d430489823031b2620c3bc05fbb2 (diff) | |
| parent | e819398870b185440e3d3fd088cdcb14184fdf64 (diff) | |
| download | build-c2fb6e107d81e50a58fe25073f490b9dd48b31e2.zip build-c2fb6e107d81e50a58fe25073f490b9dd48b31e2.tar.gz build-c2fb6e107d81e50a58fe25073f490b9dd48b31e2.tar.bz2 | |
Merge "Both ext4 and f2fs binaries for adoptable storage." into mnc-dev
| -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 9f0f8a8..982f7da 100644 --- a/target/product/emulator.mk +++ b/target/product/emulator.mk @@ -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 \ |