From 643ee34074b4f2c684557c12c55eb8b69c499622 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Wed, 18 Nov 2020 18:52:13 -0800 Subject: [PATCH] AOSP: tune2fs/resize2fs: make vendor_ramdisk_available. The vendor_ramdisk variant is dynamic, unlike the ramdisk variant. Test: builds Google-Bug-Id: 173425293 Change-Id: I45547b5ea99aae98727121c038129844b7930ed6 From AOSP commit: 073ede3200afeffd82889cb61a71fa1947314476 --- e2fsck/Android.bp | 1 + lib/blkid/Android.bp | 1 + lib/e2p/Android.bp | 1 + lib/et/Android.bp | 1 + lib/ext2fs/Android.bp | 1 + lib/support/Android.bp | 1 + misc/Android.bp | 1 + resize/Android.bp | 1 + 8 files changed, 8 insertions(+) diff --git a/e2fsck/Android.bp b/e2fsck/Android.bp index 0be6f043d..f0a562fef 100644 --- a/e2fsck/Android.bp +++ b/e2fsck/Android.bp @@ -53,6 +53,7 @@ e2fsck_libs = [ cc_binary { name: "e2fsck", host_supported: true, + vendor_ramdisk_available: true, defaults: ["e2fsck-defaults"], shared_libs: e2fsck_libs, diff --git a/lib/blkid/Android.bp b/lib/blkid/Android.bp index ccfdf8b98..64aef6f02 100644 --- a/lib/blkid/Android.bp +++ b/lib/blkid/Android.bp @@ -4,6 +4,7 @@ cc_library { name: "libext2_blkid", host_supported: true, ramdisk_available: true, + vendor_ramdisk_available: true, recovery_available: true, unique_host_soname: true, defaults: ["e2fsprogs-defaults"], diff --git a/lib/e2p/Android.bp b/lib/e2p/Android.bp index aa09ad060..2a7097260 100644 --- a/lib/e2p/Android.bp +++ b/lib/e2p/Android.bp @@ -4,6 +4,7 @@ cc_library { name: "libext2_e2p", host_supported: true, ramdisk_available: true, + vendor_ramdisk_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 7df5bf600..f74f7f016 100644 --- a/lib/et/Android.bp +++ b/lib/et/Android.bp @@ -4,6 +4,7 @@ cc_library { name: "libext2_com_err", host_supported: true, ramdisk_available: true, + vendor_ramdisk_available: true, recovery_available: true, unique_host_soname: true, defaults: ["e2fsprogs-defaults"], diff --git a/lib/ext2fs/Android.bp b/lib/ext2fs/Android.bp index 8a46c025f..fd5c4df37 100644 --- a/lib/ext2fs/Android.bp +++ b/lib/ext2fs/Android.bp @@ -4,6 +4,7 @@ cc_library { name: "libext2fs", host_supported: true, ramdisk_available: true, + vendor_ramdisk_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 14f2f2397..4813426e3 100644 --- a/lib/support/Android.bp +++ b/lib/support/Android.bp @@ -4,6 +4,7 @@ cc_library { name: "libext2_quota", host_supported: true, ramdisk_available: true, + vendor_ramdisk_available: true, recovery_available: true, unique_host_soname: true, defaults: ["e2fsprogs-defaults"], diff --git a/misc/Android.bp b/misc/Android.bp index a93bea4d5..757381d8c 100644 --- a/misc/Android.bp +++ b/misc/Android.bp @@ -129,6 +129,7 @@ tune2fs_libs = [ cc_binary { name: "tune2fs", host_supported: true, + vendor_ramdisk_available: true, defaults: ["tune2fs-defaults"], shared_libs: tune2fs_libs, diff --git a/resize/Android.bp b/resize/Android.bp index 8acdcf620..8e269c74e 100644 --- a/resize/Android.bp +++ b/resize/Android.bp @@ -24,6 +24,7 @@ cc_defaults { cc_binary { name: "resize2fs", host_supported: true, + vendor_ramdisk_available: true, defaults: ["resize2fs-defaults"], // Host binaries can be compiled statically to be re-used in other environments. -- 2.47.2