From 61bc5a7097ba2537756cc025fd50a84c4cba326b Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 23 Jul 2021 10:52:06 -0700 Subject: [PATCH 1/2] Make libfs_mgr dependencies vendor_ramdisk_available. This is needed to link libfs_mgr with snapuserd. Bug: 193833730 Test: builds Change-Id: If499d7ec060f9964ccd6900dcaa6425a34ae5ec8 --- libcrypto_utils/Android.bp | 1 + libkeyutils/Android.bp | 1 + 2 files changed, 2 insertions(+) diff --git a/libcrypto_utils/Android.bp b/libcrypto_utils/Android.bp index c8a183bf1..a9f6958e3 100644 --- a/libcrypto_utils/Android.bp +++ b/libcrypto_utils/Android.bp @@ -22,6 +22,7 @@ cc_library { name: "libcrypto_utils", vendor_available: true, ramdisk_available: true, + vendor_ramdisk_available: true, recovery_available: true, vndk: { enabled: true, diff --git a/libkeyutils/Android.bp b/libkeyutils/Android.bp index fbb8049b7..3af07b47c 100644 --- a/libkeyutils/Android.bp +++ b/libkeyutils/Android.bp @@ -14,6 +14,7 @@ cc_library { cflags: ["-Werror"], defaults: ["linux_bionic_supported"], ramdisk_available: true, + vendor_ramdisk_available: true, recovery_available: true, export_include_dirs: ["include/"], local_include_dirs: ["include/"], From a07503afc1928b5a250c72feda2e1962abec4dc9 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 23 Jul 2021 10:50:24 -0700 Subject: [PATCH 2/2] Make libfs_mgr and its dependencies vendor_ramdisk_available. This is needed to link libfs_mgr with snapuserd. Bug: 193833730 Test: builds Change-Id: I5abd706fe134fecebb80ecb790b5be0495e2b925 --- fs_mgr/Android.bp | 2 ++ fs_mgr/libfiemap/Android.bp | 1 + fs_mgr/libfs_avb/Android.bp | 1 + fs_mgr/liblp/Android.bp | 1 + fs_mgr/libstorage_literals/Android.bp | 1 + 5 files changed, 6 insertions(+) diff --git a/fs_mgr/Android.bp b/fs_mgr/Android.bp index abd2483cf..d4fc2b937 100644 --- a/fs_mgr/Android.bp +++ b/fs_mgr/Android.bp @@ -144,6 +144,7 @@ cc_library { // It does not have a stable interface. name: "libfs_mgr", ramdisk_available: true, + vendor_ramdisk_available: true, recovery_available: true, defaults: [ "libfs_mgr_defaults", @@ -169,6 +170,7 @@ cc_library_static { name: "libfstab", vendor_available: true, ramdisk_available: true, + vendor_ramdisk_available: true, recovery_available: true, host_supported: true, defaults: ["fs_mgr_defaults"], diff --git a/fs_mgr/libfiemap/Android.bp b/fs_mgr/libfiemap/Android.bp index b62e33fdd..d16b8d677 100644 --- a/fs_mgr/libfiemap/Android.bp +++ b/fs_mgr/libfiemap/Android.bp @@ -21,6 +21,7 @@ package { cc_library_headers { name: "libfiemap_headers", ramdisk_available: true, + vendor_ramdisk_available: true, recovery_available: true, export_include_dirs: ["include"], } diff --git a/fs_mgr/libfs_avb/Android.bp b/fs_mgr/libfs_avb/Android.bp index 62493ebd9..0cbd9db9a 100644 --- a/fs_mgr/libfs_avb/Android.bp +++ b/fs_mgr/libfs_avb/Android.bp @@ -28,6 +28,7 @@ cc_library_static { name: "libfs_avb", defaults: ["fs_mgr_defaults"], ramdisk_available: true, + vendor_ramdisk_available: true, recovery_available: true, host_supported: true, export_include_dirs: ["include"], diff --git a/fs_mgr/liblp/Android.bp b/fs_mgr/liblp/Android.bp index 86ca8f35f..fc2d8a1fc 100644 --- a/fs_mgr/liblp/Android.bp +++ b/fs_mgr/liblp/Android.bp @@ -31,6 +31,7 @@ cc_library { name: "liblp", host_supported: true, ramdisk_available: true, + vendor_ramdisk_available: true, recovery_available: true, defaults: ["fs_mgr_defaults"], cppflags: [ diff --git a/fs_mgr/libstorage_literals/Android.bp b/fs_mgr/libstorage_literals/Android.bp index fd7ea0473..42abd0937 100644 --- a/fs_mgr/libstorage_literals/Android.bp +++ b/fs_mgr/libstorage_literals/Android.bp @@ -7,6 +7,7 @@ cc_library_headers { name: "libstorage_literals_headers", host_supported: true, ramdisk_available: true, + vendor_ramdisk_available: true, recovery_available: true, export_include_dirs: ["."], target: {