summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorDavid Anderson <dvander@google.com>2018-06-01 03:11:40 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-06-01 03:11:40 +0200
commit5a78f3984f232288da672bc0e9cac8b41a1f6edd (patch)
tree863032ef175cf97c713f7cb16d2a3d8efe38c654 /Android.mk
parentMerge "updater_sample: Add @GuardedBy" am: 2759733136 (diff)
parentMerge "recovery: add --fsck_unshare_blocks option for adb remount" (diff)
downloadandroid_bootable_recovery-5a78f3984f232288da672bc0e9cac8b41a1f6edd.tar
android_bootable_recovery-5a78f3984f232288da672bc0e9cac8b41a1f6edd.tar.gz
android_bootable_recovery-5a78f3984f232288da672bc0e9cac8b41a1f6edd.tar.bz2
android_bootable_recovery-5a78f3984f232288da672bc0e9cac8b41a1f6edd.tar.lz
android_bootable_recovery-5a78f3984f232288da672bc0e9cac8b41a1f6edd.tar.xz
android_bootable_recovery-5a78f3984f232288da672bc0e9cac8b41a1f6edd.tar.zst
android_bootable_recovery-5a78f3984f232288da672bc0e9cac8b41a1f6edd.zip
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk8
1 files changed, 8 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index a013511a1..2992f0637 100644
--- a/Android.mk
+++ b/Android.mk
@@ -145,6 +145,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
adb_install.cpp \
+ fsck_unshare_blocks.cpp \
fuse_sdcard_provider.cpp \
install.cpp \
recovery.cpp \
@@ -205,6 +206,13 @@ LOCAL_REQUIRED_MODULES += \
endif
endif
+# e2fsck is needed for adb remount -R.
+ifeq ($(BOARD_EXT4_SHARE_DUP_BLOCKS),true)
+ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
+LOCAL_REQUIRED_MODULES += e2fsck_static
+endif
+endif
+
ifeq ($(BOARD_CACHEIMAGE_PARTITION_SIZE),)
LOCAL_REQUIRED_MODULES += \
recovery-persist \