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

Commit 8759cbd5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "libsnapshot: add library for test helpers"

parents 687b5526 0daaa72b

fs_mgr/libsnapshot/Android.bp

+29 −0
Original line number Diff line number Diff line
@@ -121,6 +121,34 @@ cc_library_static { 
    ],

}



cc_library_static {

    name: "libsnapshot_test_helpers",

    defaults: ["libsnapshot_defaults"],

    export_include_dirs: [

        "include_test",

    ],

    srcs: [

        "test_helpers.cpp",

    ],

    shared_libs: [

        "android.hardware.boot@1.1",

        "libcrypto",

    ],

    export_shared_lib_headers: [

        "android.hardware.boot@1.1",

    ],

    header_libs: [

        "libstorage_literals_headers",

    ],

    export_header_lib_headers: [

        "libstorage_literals_headers",

    ],

    static_libs: [

        "libgtest",

        "libgmock",

    ],

}



cc_test {

    name: "libsnapshot_test",

    defaults: ["libsnapshot_defaults"],
@@ -144,6 +172,7 @@ cc_test { 
        "libgmock",

        "liblp",

        "libsnapshot",

        "libsnapshot_test_helpers",

        "libsparse",

        "libz",

    ],

fs_mgr/libsnapshot/partition_cow_creator_test.cpp

+2 −1
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ 
#include <liblp/builder.h>

#include <liblp/property_fetcher.h>



#include <libsnapshot/test_helpers.h>



#include "dm_snapshot_internals.h"

#include "partition_cow_creator.h"

#include "test_helpers.h"

#include "utility.h"



using namespace android::fs_mgr;

fs_mgr/libsnapshot/snapshot_metadata_updater_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <liblp/builder.h>

#include <storage_literals/storage_literals.h>



#include "test_helpers.h"

#include <libsnapshot/test_helpers.h>



using namespace android::storage_literals;

using android::fs_mgr::LpMetadata;

fs_mgr/libsnapshot/snapshot_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#include <storage_literals/storage_literals.h>



#include <android/snapshot/snapshot.pb.h>

#include "test_helpers.h"

#include <libsnapshot/test_helpers.h>

#include "utility.h"



namespace android {