diff options
| author | Johan Redestig <johan.redestig@sonymobile.com> | 2015-10-08 21:36:35 +0200 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-10-13 14:49:38 +0000 |
| commit | 67b3cad9a0de47f0afd5aaf9471661383acd2531 (patch) | |
| tree | f4984ac0f72c4d989c727cab36afe87bd6da6fe9 /fs_mgr/Android.mk | |
| parent | 73bf853edfd89c733fabb563a5dcd20a6599ffb9 (diff) | |
| download | core-67b3cad9a0de47f0afd5aaf9471661383acd2531.tar.gz core-67b3cad9a0de47f0afd5aaf9471661383acd2531.tar.bz2 core-67b3cad9a0de47f0afd5aaf9471661383acd2531.zip | |
Switch to android::base::ReadFully
The if (read(...size) != size) pattern is unreliable, switch
to the android base ReadFully which wraps read in a loop.
Change-Id: I2324e4c45da3c9b53b18df6eb09ce69a6604b5d1
Diffstat (limited to 'fs_mgr/Android.mk')
| -rw-r--r-- | fs_mgr/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk index 8b09f53fb..b47199f2b 100644 --- a/fs_mgr/Android.mk +++ b/fs_mgr/Android.mk @@ -12,7 +12,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/include \ external/openssl/include LOCAL_MODULE:= libfs_mgr -LOCAL_STATIC_LIBRARIES := liblogwrap libmincrypt libext4_utils_static libsquashfs_utils +LOCAL_STATIC_LIBRARIES := liblogwrap libmincrypt libext4_utils_static libsquashfs_utils libbase LOCAL_C_INCLUDES += system/extras/ext4_utils system/extras/squashfs_utils \ bootable/recovery LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include @@ -39,7 +39,7 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)/sbin LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_UNSTRIPPED) -LOCAL_STATIC_LIBRARIES := libfs_mgr liblogwrap libcutils liblog libc libmincrypt libext4_utils_static libsquashfs_utils +LOCAL_STATIC_LIBRARIES := libfs_mgr liblogwrap libcutils liblog libc libmincrypt libext4_utils_static libsquashfs_utils libbase LOCAL_STATIC_LIBRARIES += libsparse_static libz libselinux LOCAL_CXX_STL := libc++_static |