diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2015-05-22 15:43:50 +0100 |
|---|---|---|
| committer | Sami Tolvanen <samitolvanen@google.com> | 2015-10-14 22:12:04 +0100 |
| commit | 99e3a927e89bd0fa67a13511071260fa02d13fa1 (patch) | |
| tree | 9dc33e60957ee60a12a8548c4debc87fa4aa826b /fs_mgr/Android.mk | |
| parent | 7d691756e8bcdbd66889f7c07c82fbcd07a8d793 (diff) | |
| download | system_core-99e3a927e89bd0fa67a13511071260fa02d13fa1.tar.gz system_core-99e3a927e89bd0fa67a13511071260fa02d13fa1.tar.bz2 system_core-99e3a927e89bd0fa67a13511071260fa02d13fa1.zip | |
Error correction: Use libfec in fs_mgr
Use libfec to read and parse verity metadata to protect against data
corruption.
Bug: 21893453
Change-Id: I3a3543e0d999316707302b3be8735a7133d22946
Diffstat (limited to 'fs_mgr/Android.mk')
| -rw-r--r-- | fs_mgr/Android.mk | 56 |
1 files changed, 33 insertions, 23 deletions
diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk index b47199f2b..28fff3f1d 100644 --- a/fs_mgr/Android.mk +++ b/fs_mgr/Android.mk @@ -1,49 +1,59 @@ # Copyright 2011 The Android Open Source Project LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) -LOCAL_SRC_FILES:= fs_mgr.c fs_mgr_verity.cpp fs_mgr_fstab.c -LOCAL_SRC_FILES += fs_mgr_format.c fs_mgr_slotselect.c +common_static_libraries := \ + liblogwrap \ + libfec \ + libfec_rs \ + libbase \ + libmincrypt \ + libcrypto_static \ + libext4_utils_static \ + libsquashfs_utils -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include \ +include $(CLEAR_VARS) +LOCAL_CLANG := true +LOCAL_SANITIZE := integer +LOCAL_SRC_FILES:= \ + fs_mgr.c \ + fs_mgr_format.c \ + fs_mgr_fstab.c \ + fs_mgr_slotselect.c \ + fs_mgr_verity.cpp +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/include \ system/vold \ system/extras/ext4_utils \ - external/openssl/include - + external/openssl/include \ + bootable/recovery LOCAL_MODULE:= libfs_mgr -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_STATIC_LIBRARIES := $(common_static_libraries) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_CFLAGS := -Werror - ifneq (,$(filter userdebug,$(TARGET_BUILD_VARIANT))) LOCAL_CFLAGS += -DALLOW_ADBD_DISABLE_VERITY=1 endif - include $(BUILD_STATIC_LIBRARY) - - include $(CLEAR_VARS) - +LOCAL_CLANG := true +LOCAL_SANITIZE := integer LOCAL_SRC_FILES:= fs_mgr_main.c - LOCAL_C_INCLUDES := $(LOCAL_PATH)/include - LOCAL_MODULE:= fs_mgr - LOCAL_MODULE_TAGS := optional 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 libbase -LOCAL_STATIC_LIBRARIES += libsparse_static libz libselinux +LOCAL_STATIC_LIBRARIES := libfs_mgr \ + $(common_static_libraries) \ + libcutils \ + liblog \ + libc \ + libsparse_static \ + libz \ + libselinux LOCAL_CXX_STL := libc++_static - LOCAL_CFLAGS := -Werror - include $(BUILD_EXECUTABLE) - |