From: Jin Qian <jinqian@google.com>
Date: Fri, 9 Jun 2017 19:37:27 +0000 (-0700)
Subject: AOSP: build mke2fs and e2fsdroid as static executables for recovery mode
X-Git-Tag: v1.44.0-rc1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e650c3afcba2a590048fcf2a7f020391707d4c7c;p=thirdparty%2Fe2fsprogs.git

AOSP: build mke2fs and e2fsdroid as static executables for recovery mode

Bug: 35219933
Change-Id: I84f105cafc57c513d83d9e4d26e9e67ef805e33e
From AOSP commit: 834180cc81c100f264d4f96a2776c51a99a810f8
---

diff --git a/contrib/android/Android.mk b/contrib/android/Android.mk
new file mode 100644
index 000000000..98ce01d80
--- /dev/null
+++ b/contrib/android/Android.mk
@@ -0,0 +1,42 @@
+LOCAL_PATH := $(call my-dir)
+
+#########################################################################
+# Build statically linked e2fsdroid for recovery
+e2fsdroid_src_files := \
+        e2fsdroid.c \
+        block_range.c \
+        fsmap.c \
+        block_list.c \
+        base_fs.c \
+        perms.c \
+        basefs_allocator.c \
+        hashmap.c \
+
+e2fsdroid_cflags := -W -Wall
+
+e2fsdroid_static_libraries := \
+        libext2_com_err \
+        libext2_misc \
+        libcutils \
+        libselinux \
+        libcrypto \
+        libsparse \
+        liblog \
+        libz \
+
+e2fsdroid_whole_static_libraries := \
+        libbase \
+        libext2fs \
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(e2fsdroid_src_files)
+LOCAL_CFLAGS := $(e2fsdroid_cflags)
+LOCAL_WHOLE_STATIC_LIBRARIES := $(e2fsdroid_whole_static_libraries)
+LOCAL_STATIC_LIBRARIES := $(e2fsdroid_static_libraries)
+LOCAL_MODULE := e2fsdroid_static
+LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
+LOCAL_FORCE_STATIC_EXECUTABLE := true
+
+include $(BUILD_EXECUTABLE)
+
diff --git a/misc/Android.mk b/misc/Android.mk
new file mode 100644
index 000000000..d3bb8207d
--- /dev/null
+++ b/misc/Android.mk
@@ -0,0 +1,42 @@
+LOCAL_PATH := $(call my-dir)
+
+#########################################################################
+# Build statically linked mke2fs for recovery
+mke2fs_src_files := \
+       mke2fs.c \
+       util.c \
+       mk_hugefiles.c \
+       default_profile.c \
+       create_inode.c \
+
+mke2fs_c_includes := \
+       external/e2fsprogs/e2fsck
+
+mke2fs_cflags := -W -Wall -Wno-macro-redefined
+
+mke2fs_static_libraries := \
+       libext2_blkid \
+       libext2_uuid \
+       libext2_quota \
+       libext2_com_err \
+       libext2_e2p \
+       libsparse \
+       libz \
+
+mke2fs_whole_static_libraries := \
+       libbase \
+       libext2fs \
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(mke2fs_src_files)
+LOCAL_C_INCLUDES := $(mke2fs_c_includes)
+LOCAL_CFLAGS := $(mke2fs_cflags)
+LOCAL_WHOLE_STATIC_LIBRARIES := $(mke2fs_whole_static_libraries)
+LOCAL_STATIC_LIBRARIES := $(mke2fs_static_libraries)
+LOCAL_MODULE := mke2fs_static
+LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
+LOCAL_FORCE_STATIC_EXECUTABLE := true
+
+include $(BUILD_EXECUTABLE)
+