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

Commit 5dd50b2b authored by Alessio Balsini's avatar Alessio Balsini
Browse files

Dependency cleanup for snapshot .bp 



Reorder, remove and fix some of the dependencies in the Android.bp for
snapshot.

Test: m, snapshot_test, OTA
Bug: 142513589
Change-Id: Id214a8d6453a5675e60cda4352094dc3987292ec
Signed-off-by: default avatarAlessio Balsini <balsini@google.com>
parent a7383b40

fs_mgr/libsnapshot/Android.bp

+11 −13
Original line number Original line Diff line number Diff line
@@ -24,14 +24,13 @@ cc_defaults { 
    ],

    ],

    shared_libs: [

    shared_libs: [

        "libbase",

        "libbase",

        "libcutils",

        "liblog",

        "liblog",

        "liblp",

        "liblp",

    ],

    ],

    static_libs: [

    static_libs: [

        "libcutils",

        "libdm",

        "libdm",

        "libfstab",

        "libfstab",

        "liblp",

        "update_metadata-protos",

        "update_metadata-protos",

    ],

    ],

    whole_static_libs: [

    whole_static_libs: [
@@ -146,8 +145,8 @@ cc_library_static { 
    ],

    ],

    static_libs: [

    static_libs: [

        "libfs_mgr",

        "libfs_mgr",

        "libgtest",

        "libgmock",

        "libgmock",

        "libgtest",

    ],

    ],

}

}
@@ -155,29 +154,28 @@ cc_test { 
    name: "libsnapshot_test",

    name: "libsnapshot_test",

    defaults: ["libsnapshot_defaults"],

    defaults: ["libsnapshot_defaults"],

    srcs: [

    srcs: [

        "snapshot_test.cpp",

        "partition_cow_creator_test.cpp",

        "partition_cow_creator_test.cpp",

        "snapshot_metadata_updater_test.cpp",

        "snapshot_metadata_updater_test.cpp",

        "test_helpers.cpp",

        "snapshot_test.cpp",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "android.hardware.boot@1.0",

        "android.hardware.boot@1.1",

        "libbinder",

        "libbinder",

        "libcrypto",

        "libcrypto",

        "libfs_mgr",

        "libgsi",

        "libhidlbase",

        "libhidlbase",

        "liblp",

        "libprotobuf-cpp-lite",

        "libprotobuf-cpp-lite",

        "libsparse",

        "libutils",

        "libutils",

        "libz",

    ],

    ],

    static_libs: [

    static_libs: [

        "android.hardware.boot@1.0",

        "android.hardware.boot@1.1",

        "libfs_mgr",

        "libgmock",

        "libgmock",

        "libgsi",

        "liblp",

        "libsnapshot",

        "libsnapshot",

        "libsnapshot_test_helpers",

        "libsnapshot_test_helpers",

        "libsparse",

        "libz",

    ],

    ],

    header_libs: [

    header_libs: [

        "libstorage_literals_headers",

        "libstorage_literals_headers",
@@ -192,7 +190,6 @@ cc_binary { 
    ],

    ],

    static_libs: [

    static_libs: [

        "libdm",

        "libdm",

        "libext2_uuid",

        "libfstab",

        "libfstab",

        "libsnapshot",

        "libsnapshot",

    ],

    ],
@@ -202,6 +199,7 @@ cc_binary { 
        "libbase",

        "libbase",

        "libbinder",

        "libbinder",

        "libbinderthreadstate",

        "libbinderthreadstate",

        "libext2_uuid",

        "libext4_utils",

        "libext4_utils",

        "libfs_mgr_binder",

        "libfs_mgr_binder",

        "libhidlbase",

        "libhidlbase",