diff options
author | Yifan Hong <elsk@google.com> | 2020-11-20 21:45:01 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-20 21:45:01 +0000 |
commit | 48459acea8089266536cfa79a80d465c333c7173 (patch) | |
tree | f3dffce24bd3c1b129821e3f70039e2345861990 | |
parent | 613751c5e3eef613df33b3e83bee0ca813835578 (diff) | |
parent | 1cf776987589cd03b7d937c1c6e722d7dddd0f66 (diff) | |
download | e2fsprogs-48459acea8089266536cfa79a80d465c333c7173.tar.gz |
Merge "tune2fs/resize2fs: make vendor_ramdisk_available." am: f99e90447c am: 3eee439066 am: 1cf7769875
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/1504158
Change-Id: I0399929d97f5a8d0a7cf149665f48cc4bed69666
-rw-r--r-- | e2fsck/Android.bp | 1 | ||||
-rw-r--r-- | lib/Android.bp | 1 | ||||
-rw-r--r-- | lib/blkid/Android.bp | 1 | ||||
-rw-r--r-- | lib/e2p/Android.bp | 1 | ||||
-rw-r--r-- | lib/et/Android.bp | 1 | ||||
-rw-r--r-- | lib/ext2fs/Android.bp | 1 | ||||
-rw-r--r-- | lib/support/Android.bp | 1 | ||||
-rw-r--r-- | lib/uuid/Android.bp | 1 | ||||
-rw-r--r-- | misc/Android.bp | 1 | ||||
-rw-r--r-- | resize/Android.bp | 1 |
10 files changed, 10 insertions, 0 deletions
diff --git a/e2fsck/Android.bp b/e2fsck/Android.bp index 0be6f043..f0a562fe 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/Android.bp b/lib/Android.bp index 0a498d61..78031aa5 100644 --- a/lib/Android.bp +++ b/lib/Android.bp @@ -9,6 +9,7 @@ cc_library_headers { vendor_available: true, product_available: true, ramdisk_available: true, + vendor_ramdisk_available: true, recovery_available: true, target: { windows: { diff --git a/lib/blkid/Android.bp b/lib/blkid/Android.bp index ccfdf8b9..64aef6f0 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 aa09ad06..2a709726 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 7df5bf60..f74f7f01 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 8a46c025..fd5c4df3 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 14f2f239..4813426e 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/lib/uuid/Android.bp b/lib/uuid/Android.bp index 61673fdd..d8929a61 100644 --- a/lib/uuid/Android.bp +++ b/lib/uuid/Android.bp @@ -4,6 +4,7 @@ cc_library { name: "libext2_uuid", host_supported: true, ramdisk_available: true, + vendor_ramdisk_available: true, recovery_available: true, vendor_available: true, product_available: true, diff --git a/misc/Android.bp b/misc/Android.bp index a93bea4d..757381d8 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 8acdcf62..8e269c74 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. |