diff options
| author | quanganh2627 <quanganh2627@gmail.com> | 2015-04-15 02:15:13 +0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-16 06:53:03 -0700 |
| commit | 76ce3b6bb2f6d5aa540275b80579c45fbbb7652a (patch) | |
| tree | 459069ac880eaa6a3b40011106eb96937bda84eb | |
| parent | f0b761f83d19ab2bb5bbba3ef77a5f75ef8ab7b6 (diff) | |
| download | system_core-76ce3b6bb2f6d5aa540275b80579c45fbbb7652a.tar.gz system_core-76ce3b6bb2f6d5aa540275b80579c45fbbb7652a.tar.bz2 system_core-76ce3b6bb2f6d5aa540275b80579c45fbbb7652a.zip | |
Rename libext2_uuid -> libext2_uuid_static lib
Change-Id: I2dd416558321c424bca97efa973ee5a68b742a64
| -rw-r--r-- | fs_mgr/Android.mk | 4 | ||||
| -rw-r--r-- | init/Android.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs_mgr/Android.mk b/fs_mgr/Android.mk index ecd13cc67..d105b0b87 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 libext2_blkid libext2_uuid +LOCAL_STATIC_LIBRARIES := liblogwrap libmincrypt libext4_utils_static libsquashfs_utils libext2_blkid libext2_uuid_static LOCAL_C_INCLUDES += system/extras/ext4_utils system/extras/squashfs_utils external/e2fsprogs/lib LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_CFLAGS := -Werror @@ -38,7 +38,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 libext2_blkid libext2_uuid +LOCAL_STATIC_LIBRARIES := libfs_mgr liblogwrap libcutils liblog libc libmincrypt libext4_utils_static libsquashfs_utils libext2_blkid libext2_uuid_static LOCAL_STATIC_LIBRARIES += libsparse_static libz libselinux LOCAL_CXX_STL := libc++_static diff --git a/init/Android.mk b/init/Android.mk index e6bba1169..2a911927f 100644 --- a/init/Android.mk +++ b/init/Android.mk @@ -73,7 +73,7 @@ LOCAL_STATIC_LIBRARIES := \ libmincrypt \ libext4_utils_static \ libext2_blkid \ - libext2_uuid \ + libext2_uuid_static \ libc++_static \ libdl \ libsparse_static \ |