AOSP: Make mke2fs/e2fsdroid available for vendor

vendor_init needs to execute these binaries when converting partitions
to EXT4.

Test: th
Bug: 293313353
Change-Id: I1fa49c1a0f802b3c36e96112ef262bae4d5d394a
From AOSP commit: 0b54b8227815d447b52de76bb419735b21608941

diff --git a/contrib/android/Android.bp b/contrib/android/Android.bp
index 6c9dd5c5d6b4769c52bc5692abd38f76be987110..650824ce35ec7239ff628423d6eac8c5952299b4 100644 (file)
--- a/contrib/android/Android.bp
+++ b/contrib/android/Android.bp
@@ -16,6 +16,7 @@ cc_binary {
     name: "e2fsdroid",
     host_supported: true,
     recovery_available: true,
+    vendor_available: true,
     defaults: ["e2fsprogs-defaults"],
 
     srcs: [

diff --git a/lib/e2p/Android.bp b/lib/e2p/Android.bp
index bed92c120c191f1b0c759f214696b412dc6f0361..02825cdb9a64f43795a6cc5acb2e78656e123a67 100644 (file)
--- a/lib/e2p/Android.bp
+++ b/lib/e2p/Android.bp
@@ -15,6 +15,7 @@ cc_library {
     host_supported: true,
     ramdisk_available: true,
     vendor_ramdisk_available: true,
+    vendor_available: true,
     recovery_available: true,
     unique_host_soname: true,
     defaults: ["e2fsprogs-defaults"],

diff --git a/lib/et/Android.bp b/lib/et/Android.bp
index 565feb59492fd61d33260d051a232241f4ec2856..5d4a129d261f4a91ab9357cb4bc7890f74020910 100644 (file)
--- a/lib/et/Android.bp
+++ b/lib/et/Android.bp
@@ -18,6 +18,7 @@ cc_library {
     ramdisk_available: true,
     vendor_ramdisk_available: true,
     recovery_available: true,
+    vendor_available: true,
     unique_host_soname: true,
     defaults: ["e2fsprogs-defaults"],
     srcs: [

diff --git a/lib/ext2fs/Android.bp b/lib/ext2fs/Android.bp
index db8b3b7e74aa8de689be921ead6eea15a0c65af6..af4c2db94f4bacb9aa5ce063c4bf2e6a5d1c1140 100644 (file)
--- a/lib/ext2fs/Android.bp
+++ b/lib/ext2fs/Android.bp
@@ -19,6 +19,7 @@ cc_library {
     host_supported: true,
     ramdisk_available: true,
     vendor_ramdisk_available: true,
+    vendor_available: true,
     recovery_available: true,
     unique_host_soname: true,
     defaults: ["e2fsprogs-defaults"],

diff --git a/lib/support/Android.bp b/lib/support/Android.bp
index af9b28df697a874cbcb1af7f68907cc26823f426..ded3d40184745ed931957359af44a335b6d5c9c7 100644 (file)
--- a/lib/support/Android.bp
+++ b/lib/support/Android.bp
@@ -15,6 +15,7 @@ cc_library {
     host_supported: true,
     ramdisk_available: true,
     vendor_ramdisk_available: true,
+    vendor_available: true,
     recovery_available: true,
     unique_host_soname: true,
     defaults: ["e2fsprogs-defaults"],

diff --git a/misc/Android.bp b/misc/Android.bp
index a00ac9a870cbcba2b4eabf3a0535dd5f8817a550..846edf953d9ffcde061bd16e5b7dc5615aac14e2 100644 (file)
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -18,6 +18,7 @@ cc_library {
     name: "libext2_misc",
     host_supported: true,
     recovery_available: true,
+    vendor_available: true,
     defaults: ["e2fsprogs-defaults"],
 
     target: {
@@ -58,6 +59,7 @@ cc_defaults {
 cc_binary {
     name: "mke2fs",
     host_supported: true,
+    vendor_available: true,
     defaults: ["mke2fs_defaults"],
     target: {
         host: {