Created
June 11, 2012 06:28
-
-
Save checko/2908733 to your computer and use it in GitHub Desktop.
diff to buiild mke2fs static
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/e2fsck/Android.mk b/e2fsck/Android.mk | |
index e420740..6bcc87f 100644 | |
--- a/e2fsck/Android.mk | |
+++ b/e2fsck/Android.mk | |
@@ -41,7 +41,7 @@ LOCAL_CFLAGS := -O2 -g -W -Wall \ | |
LOCAL_PRELINK_MODULE := false | |
-include $(BUILD_SHARED_LIBRARY) | |
+include $(BUILD_STATIC_LIBRARY) | |
######################### | |
@@ -77,7 +77,7 @@ LOCAL_SRC_FILES := \ | |
LOCAL_MODULE := e2fsck | |
LOCAL_MODULE_TAGS := eng | |
-LOCAL_SYSTEM_SHARED_LIBRARIES := \ | |
+LOCAL_STATIC_LIBRARIES := \ | |
libext2fs \ | |
libext2_blkid \ | |
libext2_uuid \ | |
@@ -86,6 +86,8 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := \ | |
libext2_e2p \ | |
libc | |
+LOCAL_FORCE_STATIC_EXECUTABLE := true | |
+ | |
LOCAL_C_INCLUDES := external/e2fsprogs/lib | |
LOCAL_CFLAGS := -O2 -g -W -Wall \ | |
diff --git a/lib/blkid/Android.mk b/lib/blkid/Android.mk | |
index 7a83f1d..372d129 100644 | |
--- a/lib/blkid/Android.mk | |
+++ b/lib/blkid/Android.mk | |
@@ -47,4 +47,4 @@ LOCAL_CFLAGS := -O2 -g -W -Wall \ | |
LOCAL_PRELINK_MODULE := false | |
-include $(BUILD_SHARED_LIBRARY) | |
+include $(BUILD_STATIC_LIBRARY) | |
diff --git a/lib/e2p/Android.mk b/lib/e2p/Android.mk | |
index d05feb4..ae103dc 100644 | |
--- a/lib/e2p/Android.mk | |
+++ b/lib/e2p/Android.mk | |
@@ -55,4 +55,4 @@ LOCAL_CFLAGS := -O2 -g -W -Wall \ | |
LOCAL_PRELINK_MODULE := false | |
-include $(BUILD_SHARED_LIBRARY) | |
+include $(BUILD_STATIC_LIBRARY) | |
diff --git a/lib/et/Android.mk b/lib/et/Android.mk | |
index 45406ac..efcffd8 100644 | |
--- a/lib/et/Android.mk | |
+++ b/lib/et/Android.mk | |
@@ -38,5 +38,5 @@ LOCAL_CFLAGS := -O2 -g -W -Wall \ | |
LOCAL_PRELINK_MODULE := false | |
-include $(BUILD_SHARED_LIBRARY) | |
+include $(BUILD_STATIC_LIBRARY) | |
diff --git a/lib/ext2fs/Android.mk b/lib/ext2fs/Android.mk | |
index 1c90259..74b1494 100644 | |
--- a/lib/ext2fs/Android.mk | |
+++ b/lib/ext2fs/Android.mk | |
@@ -101,5 +101,5 @@ LOCAL_CFLAGS := -O2 -g -W -Wall \ | |
LOCAL_PRELINK_MODULE := false | |
-include $(BUILD_SHARED_LIBRARY) | |
+include $(BUILD_STATIC_LIBRARY) | |
diff --git a/lib/uuid/Android.mk b/lib/uuid/Android.mk | |
index 2cad859..62004c2 100644 | |
--- a/lib/uuid/Android.mk | |
+++ b/lib/uuid/Android.mk | |
@@ -46,4 +46,4 @@ LOCAL_CFLAGS := -O2 -g -W -Wall \ | |
LOCAL_PRELINK_MODULE := false | |
-include $(BUILD_SHARED_LIBRARY) | |
+include $(BUILD_STATIC_LIBRARY) | |
diff --git a/misc/Android.mk b/misc/Android.mk | |
index 598bb4d..1c16076 100755 | |
--- a/misc/Android.mk | |
+++ b/misc/Android.mk | |
@@ -44,7 +44,7 @@ LOCAL_CFLAGS += -DNO_CHECK_BB | |
LOCAL_MODULE := mke2fs | |
LOCAL_MODULE_TAGS := optional | |
-LOCAL_SYSTEM_SHARED_LIBRARIES := \ | |
+LOCAL_STATIC_LIBRARIES := \ | |
libext2fs \ | |
libext2_blkid \ | |
libext2_uuid \ | |
@@ -53,6 +53,8 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := \ | |
libext2_e2p \ | |
libc | |
+LOCAL_FORCE_STATIC_EXECUTABLE := true | |
+ | |
include $(BUILD_EXECUTABLE) | |
########################################################################### | |
@@ -97,7 +99,7 @@ LOCAL_CFLAGS += -DNO_CHECK_BB | |
LOCAL_MODULE := tune2fs | |
LOCAL_MODULE_TAGS := optional | |
-LOCAL_SYSTEM_SHARED_LIBRARIES := \ | |
+LOCAL_STATIC_LIBRARIES := \ | |
libext2fs \ | |
libext2_com_err \ | |
libext2_blkid \ | |
@@ -105,6 +107,9 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := \ | |
libext2_e2p \ | |
libc | |
+LOCAL_FORCE_STATIC_EXECUTABLE := true | |
+ | |
+ | |
include $(BUILD_EXECUTABLE) | |
######################################################################### | |
@@ -147,9 +152,11 @@ LOCAL_CFLAGS := -O2 -g -W -Wall \ | |
LOCAL_MODULE := badblocks | |
LOCAL_MODULE_TAGS := optional | |
-LOCAL_SYSTEM_SHARED_LIBRARIES := \ | |
+LOCAL_STATIC_LIBRARIES := \ | |
libext2fs \ | |
libext2_com_err \ | |
libc | |
+LOCAL_FORCE_STATIC_EXECUTABLE := true | |
+ | |
include $(BUILD_EXECUTABLE) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment