diff options
| author | JP Abgrall <jpa@google.com> | 2014-11-24 18:06:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-24 18:06:32 +0000 |
| commit | e59f7c7cedb1e07eb4dbbb66e115c14faea19f19 (patch) | |
| tree | 0e5cd49a1680863c006260aecb69b1fca286bda1 /lib/blkid | |
| parent | 4ef951aa5e69116963f1836fe5ddcf6b87afbecd (diff) | |
| parent | d25948b9b4a9e361ef071dc8175df0407f60b7e0 (diff) | |
| download | android_external_e2fsprogs-e59f7c7cedb1e07eb4dbbb66e115c14faea19f19.tar.gz android_external_e2fsprogs-e59f7c7cedb1e07eb4dbbb66e115c14faea19f19.tar.bz2 android_external_e2fsprogs-e59f7c7cedb1e07eb4dbbb66e115c14faea19f19.zip | |
am d25948b9: tune2fs: Allow building it as a static lib
* commit 'd25948b9b4a9e361ef071dc8175df0407f60b7e0':
tune2fs: Allow building it as a static lib
Diffstat (limited to 'lib/blkid')
| -rw-r--r-- | lib/blkid/Android.mk | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/blkid/Android.mk b/lib/blkid/Android.mk index 92ef7764..24c736f6 100644 --- a/lib/blkid/Android.mk +++ b/lib/blkid/Android.mk @@ -19,6 +19,10 @@ libext2_blkid_shared_libraries := libext2_uuid libext2_blkid_system_shared_libraries := libc +libext2_blkid_static_libraries := libext2_uuid_static + +libext2_blkid_system_static_libraries := libc + libext2_blkid_c_includes := external/e2fsprogs/lib libext2_blkid_cflags := -O2 -g -W -Wall -fno-strict-aliasing \ @@ -65,6 +69,18 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libext2_blkid_src_files) +LOCAL_STATIC_LIBRARIES := $(libext2_blkid_static_libraries) $(libext2_blkid_system_static_libraries) +LOCAL_C_INCLUDES := $(libext2_blkid_c_includes) +LOCAL_CFLAGS := $(libext2_blkid_cflags) $(libext2_blkid_cflags_linux) -fno-strict-aliasing +LOCAL_PRELINK_MODULE := false +LOCAL_MODULE := libext2_blkid +LOCAL_MODULE_TAGS := optional + +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) + +LOCAL_SRC_FILES := $(libext2_blkid_src_files) LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2_blkid_shared_libraries)) LOCAL_C_INCLUDES := $(libext2_blkid_c_includes) ifeq ($(HOST_OS),linux) |