diff options
| author | Mohamad Ayyash <mkayyash@google.com> | 2015-04-08 17:59:19 -0700 |
|---|---|---|
| committer | Mohamad Ayyash <mkayyash@google.com> | 2015-04-08 18:08:00 -0700 |
| commit | 030ef35966ab30bc36f1a047df4fd45e466427ef (patch) | |
| tree | a81ad56e1dfa4b7ecebbcd52d9f5e7d46c3215db /fs_mgr/Android.mk | |
| parent | d67ff2d507add84a4d958bc19657e88d4689b92d (diff) | |
| download | system_core-030ef35966ab30bc36f1a047df4fd45e466427ef.tar.gz system_core-030ef35966ab30bc36f1a047df4fd45e466427ef.tar.bz2 system_core-030ef35966ab30bc36f1a047df4fd45e466427ef.zip | |
Revert "Revert "fs_mgr_verity: Add support for squashfs""
This reverts commit 7b97c7a3fa0f1bdae5b45a70f625ff48f9dab0c1.
Change-Id: Id47e70479fe9247b7936f2e54d4dbfbb4f63f635
Diffstat (limited to 'fs_mgr/Android.mk')
| -rw-r--r-- | fs_mgr/Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk index 1179eaa43..08d0671d1 100644 --- a/fs_mgr/Android.mk +++ b/fs_mgr/Android.mk @@ -8,8 +8,8 @@ LOCAL_SRC_FILES:= fs_mgr.c fs_mgr_verity.c fs_mgr_fstab.c LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_MODULE:= libfs_mgr -LOCAL_STATIC_LIBRARIES := liblogwrap libmincrypt libext4_utils_static -LOCAL_C_INCLUDES += system/extras/ext4_utils +LOCAL_STATIC_LIBRARIES := liblogwrap libmincrypt libext4_utils_static libsquashfs_utils +LOCAL_C_INCLUDES += system/extras/ext4_utils system/extras/squashfs_utils LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_CFLAGS := -Werror @@ -34,7 +34,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 +LOCAL_STATIC_LIBRARIES := libfs_mgr liblogwrap libcutils liblog libc libmincrypt libext4_utils_static libsquashfs_utils LOCAL_CXX_STL := libc++_static LOCAL_CFLAGS := -Werror |