diff options
| author | Jiyong Park <jiyong@google.com> | 2018-06-20 14:21:54 +0900 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-06-27 23:51:40 -0400 |
| commit | 722b9ca4cac7edc4304e2ecd7d3992e051125b33 (patch) | |
| tree | 3895fa7109ca62172f0e6a34f26434dc7ea84c02 /misc | |
| parent | 8cec4acdc03a449e8b193948ebce22fe4ad21324 (diff) | |
| download | android_external_e2fsprogs-722b9ca4cac7edc4304e2ecd7d3992e051125b33.tar.gz android_external_e2fsprogs-722b9ca4cac7edc4304e2ecd7d3992e051125b33.tar.bz2 android_external_e2fsprogs-722b9ca4cac7edc4304e2ecd7d3992e051125b33.zip | |
AOSP: e2fsdroid and mke2fs are dynamic executable in recovery partition
The two utilities are now converted to dynamic executables as shared
libraries are supported in recovery mode.
As part of the conversion, shared libraries that are depended from them
are also marked as recovery_available: true.
Bug: 79146551
Test: adb reboot recovery, and select 'Wipe data/factory reset'. The
data partition is formatted and there is no selinux denial.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Change-Id: I22fbc83a4ff0496096efca90721b0db1237c32cd
From AOSP commit: df1f088849ed3336bb4f6f200c29b30682f15948
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/Android.bp | 2 | ||||
| -rw-r--r-- | misc/Android.mk | 42 |
2 files changed, 2 insertions, 42 deletions
diff --git a/misc/Android.bp b/misc/Android.bp index e73150f8..310c9dc7 100644 --- a/misc/Android.bp +++ b/misc/Android.bp @@ -5,6 +5,7 @@ cc_library { name: "libext2_misc", host_supported: true, + recovery_available: true, defaults: ["e2fsprogs-defaults"], target: { @@ -33,6 +34,7 @@ cc_library { cc_binary { name: "mke2fs", host_supported: true, + recovery_available: true, defaults: ["e2fsprogs-defaults"], srcs: [ diff --git a/misc/Android.mk b/misc/Android.mk deleted file mode 100644 index c9d07353..00000000 --- a/misc/Android.mk +++ /dev/null @@ -1,42 +0,0 @@ -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 -Werror -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) - |