Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cce4c596 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge changes from topic "fs_mgr-vendor-ramdisk" am: f2049868 am: 97be9b52 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1777150

Change-Id: Icc1afb5542a46bb04cfdf70b0dfacbf1e372466a
parents da456de9 97be9b52

fs_mgr/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -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"],

fs_mgr/libfiemap/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -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"],

}

fs_mgr/libfs_avb/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -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"],

fs_mgr/liblp/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -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: [

fs_mgr/libstorage_literals/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -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: {