release-request-f3bcfb00-8080-4b95-b497-7457f544b4f6-for-git_oc-mr1-release-4116097...

Change-Id: Ibf9448e0b37b28c8d7f69d46fcbd10e172f4eb6f

diff --git a/contrib/android/Android.mk b/contrib/android/Android.mk
new file mode 100644 (file)
index 0000000..98ce01d
--- /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/lib/blkid/Android.bp b/lib/blkid/Android.bp
index 5ad2842..9b385f9 100644 (file)
--- a/lib/blkid/Android.bp
+++ b/lib/blkid/Android.bp
@@ -2,7 +2,6 @@
 
 cc_library {
     name: "libext2_blkid",
-    vendor_available: true,
     host_supported: true,
     unique_host_soname: true,
     srcs: [

diff --git a/lib/e2p/Android.bp b/lib/e2p/Android.bp
index c6f3779..db51670 100644 (file)
--- a/lib/e2p/Android.bp
+++ b/lib/e2p/Android.bp
@@ -2,7 +2,6 @@
 
 cc_library {
     name: "libext2_e2p",
-    vendor_available: true,
     host_supported: true,
     unique_host_soname: true,
     srcs: [

diff --git a/lib/et/Android.bp b/lib/et/Android.bp
index c9098c3..f6ad416 100644 (file)
--- a/lib/et/Android.bp
+++ b/lib/et/Android.bp
@@ -2,7 +2,6 @@
 
 cc_library {
     name: "libext2_com_err",
-    vendor_available: true,
     host_supported: true,
     unique_host_soname: true,
     srcs: [

diff --git a/lib/uuid/Android.bp b/lib/uuid/Android.bp
index 7ea7ff0..d173788 100644 (file)
--- a/lib/uuid/Android.bp
+++ b/lib/uuid/Android.bp
@@ -2,7 +2,6 @@
 
 cc_library {
     name: "libext2_uuid",
-    vendor_available: true,
     host_supported: true,
     unique_host_soname: true,
     srcs: [

diff --git a/misc/Android.mk b/misc/Android.mk
new file mode 100644 (file)
index 0000000..d3bb820
--- /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)
+