| commit | 4ea2b0c4acddb4509c741ba0390be7b39e0b9de1 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed Oct 28 16:36:23 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 28 16:36:23 2015 +0000 |
| tree | 93155aa52137c1996c77584ae1a9639b9c59b182 | |
| parent | cc9dd3d524755da156ec95ed3a91bcf7966e7e7e [diff] | |
| parent | a4121986990d7dde7918252a96d87e4c3c11c13c [diff] |
Merge "recovery: Depend on mkfs.f2fs only if needed." am: a412198699 * commit 'a4121986990d7dde7918252a96d87e4c3c11c13c': recovery: Depend on mkfs.f2fs only if needed.
diff --git a/Android.mk b/Android.mk index d96849f..22e7802 100644 --- a/Android.mk +++ b/Android.mk
@@ -46,9 +46,11 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true +ifeq ($(TARGET_USERIMAGES_USE_F2FS),true) ifeq ($(HOST_OS),linux) LOCAL_REQUIRED_MODULES := mkfs.f2fs endif +endif RECOVERY_API_VERSION := 3 RECOVERY_FSTAB_VERSION := 2