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. Change-Id: I22fbc83a4ff0496096efca90721b0db1237c32cd
SpiceOS-Beta · Jun 20, 2018 · df1f088 · df1f088
1 parent 054d51e
commit df1f088
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 83 deletions.
diff --git a/CleanSpec.mk b/CleanSpec.mk
@@ -49,3 +49,4 @@
 # ************************************************
 
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libext2_uuid_intermediates)
+$(call add-clean-step, rm -rf $(TARGET_RECOVERY_OUT)/root/sbin)
diff --git a/contrib/android/Android.bp b/contrib/android/Android.bp
@@ -6,6 +6,7 @@
 cc_binary {
     name: "e2fsdroid",
     host_supported: true,
+    recovery_available: true,
     defaults: ["e2fsprogs-defaults"],
 
     srcs: [

diff --git a/contrib/android/Android.mk b/contrib/android/Android.mk
diff --git a/lib/blkid/Android.bp b/lib/blkid/Android.bp
@@ -3,6 +3,7 @@
 cc_library {
     name: "libext2_blkid",
     host_supported: true,
+    recovery_available: true,
     unique_host_soname: true,
     defaults: ["e2fsprogs-defaults"],
     srcs: [

diff --git a/lib/e2p/Android.bp b/lib/e2p/Android.bp
@@ -3,6 +3,7 @@
 cc_library {
     name: "libext2_e2p",
     host_supported: true,
+    recovery_available: true,
     unique_host_soname: true,
     defaults: ["e2fsprogs-defaults"],
     srcs: [

diff --git a/lib/et/Android.bp b/lib/et/Android.bp
@@ -3,6 +3,7 @@
 cc_library {
     name: "libext2_com_err",
     host_supported: true,
+    recovery_available: true,
     unique_host_soname: true,
     defaults: ["e2fsprogs-defaults"],
     srcs: [

diff --git a/lib/ext2fs/Android.bp b/lib/ext2fs/Android.bp
@@ -3,6 +3,7 @@
 cc_library {
     name: "libext2fs",
     host_supported: true,
+    recovery_available: true,
     unique_host_soname: true,
     defaults: ["e2fsprogs-defaults"],
     srcs: [

diff --git a/lib/support/Android.bp b/lib/support/Android.bp
@@ -3,6 +3,7 @@
 cc_library {
     name: "libext2_quota",
     host_supported: true,
+    recovery_available: true,
     unique_host_soname: true,
     defaults: ["e2fsprogs-defaults"],
     srcs: [

diff --git 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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,3 +49,4 @@
		# ************************************************

		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libext2_uuid_intermediates)
		$(call add-clean-step, rm -rf $(TARGET_RECOVERY_OUT)/root/sbin)