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

Commit fb066360 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "libc++fs is part of libc++ now." into main am: 5b09799b 

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



Change-Id: I7b5197225d6ec3beb468e3c36d3c814426bc96bb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d3e28326 5b09799b

fastboot/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ cc_binary { 


    static_libs: [

        "android.hardware.health-translate-ndk",

        "libc++fs",

        "libhealthhalutils",

        "libhealthshim",

        "libfastbootshim",
@@ -416,7 +415,6 @@ cc_test_host { 
    srcs: ["vendor_boot_img_utils_test.cpp"],

    static_libs: [

        "libbase",

        "libc++fs",

        "libfastboot",

        "libgmock",

        "liblog",

fs_mgr/libsnapshot/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ cc_library { 
        "libprotobuf-cpp-lite",

    ],

    static_libs: [

        "libc++fs",

        "libsnapshot_cow",

    ],

}
@@ -269,7 +268,6 @@ cc_defaults { 
        "android.hardware.boot@1.1",

        "android.hardware.boot-V1-ndk",

        "libbrotli",

        "libc++fs",

        "libfs_mgr_binder",

        "libgflags",

        "libgsi",
@@ -350,7 +348,6 @@ cc_binary { 
    ],

    static_libs: [

        "libbrotli",

        "libc++fs",

        "libfstab",

        "libz",

        "update_metadata-protos",

init/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ libinit_cc_defaults { 
        "libavb",

        "libavf_cc_flags",

        "libbootloader_message",

        "libc++fs",

        "libcgrouprc_format",

        "liblmkd_utils",

        "liblz4",
@@ -371,7 +370,6 @@ init_first_stage_cc_defaults { 
    ],



    static_libs: [

        "libc++fs",

        "libfs_avb",

        "libavf_cc_flags",

        "libfs_mgr",

init/fuzzer/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ package { 
cc_defaults {

    name: "libinit_fuzzer_defaults",

    static_libs: [

        "libc++fs",

        "liblmkd_utils",

        "libmodprobe",

        "libprotobuf-cpp-lite",