summaryrefslogtreecommitdiffstats
path: root/fs_mgr/Android.mk
diff options
context:
space:
mode:
authorDavid Zeuthen <zeuthen@google.com>2015-09-03 12:23:12 -0400
committerDavid Zeuthen <zeuthen@google.com>2015-09-08 15:54:32 -0400
commit227ef3c5d2ffb3e05fa80596b21c2095b9698b99 (patch)
tree4d8c5962bd0654a7ca23224e975023c9a2ab60a8 /fs_mgr/Android.mk
parentc5d278d48edaa5500e9ea355d8cbb96712de0522 (diff)
downloadsystem_core-227ef3c5d2ffb3e05fa80596b21c2095b9698b99.tar.gz
system_core-227ef3c5d2ffb3e05fa80596b21c2095b9698b99.tar.bz2
system_core-227ef3c5d2ffb3e05fa80596b21c2095b9698b99.zip
fs_mgr: Use slot_suffix field from bootloader_message.
This will make fs_mgr look in the misc partition for the A/B suffix to use if one of more fstab entries is using the slotselect option and the bootloader doesn't specify the suffix. Change-Id: I24233195f60dd352bf8e7ac32b0d95dcd3323156
Diffstat (limited to 'fs_mgr/Android.mk')
-rw-r--r--fs_mgr/Android.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk
index 08d0671d1..cf2965e6a 100644
--- a/fs_mgr/Android.mk
+++ b/fs_mgr/Android.mk
@@ -3,13 +3,14 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= fs_mgr.c fs_mgr_verity.c fs_mgr_fstab.c
+LOCAL_SRC_FILES:= fs_mgr.c fs_mgr_verity.c fs_mgr_fstab.c fs_mgr_slotselect.c
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_MODULE:= libfs_mgr
LOCAL_STATIC_LIBRARIES := liblogwrap libmincrypt libext4_utils_static libsquashfs_utils
-LOCAL_C_INCLUDES += system/extras/ext4_utils system/extras/squashfs_utils
+LOCAL_C_INCLUDES += system/extras/ext4_utils system/extras/squashfs_utils \
+ bootable/recovery
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
LOCAL_CFLAGS := -Werror