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

Commit 288954ac authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "trusty: Add vendor variant of libtrusty_coverage" am: 292fd545 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9f92cf429724ad0a7ec1012a1f925a7027f986f
parents 0b0c5424 292fd545

trusty/coverage/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


cc_library {

    name: "libtrusty_coverage",

    vendor_available: true,

    srcs: [

        "coverage.cpp",

    ],
@@ -21,8 +22,9 @@ cc_library { 
        "include",

    ],

    static_libs: [

        "libtrusty_test",

        "libtrusty",

    ],



    shared_libs: [

        "libbase",

        "liblog",
@@ -36,7 +38,7 @@ cc_test { 
    ],

    static_libs: [

        "libtrusty_coverage",

        "libtrusty_test",

        "libtrusty",

    ],

    shared_libs: [

        "libbase",

trusty/fuzz/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ cc_library { 
    export_include_dirs: ["include"],

    static_libs: [

        "libFuzzer",

        "libtrusty_test",

        "libtrusty",

    ],

    shared_libs: [

        "libtrusty_coverage",

trusty/libtrusty/Android.bp

+3 −8
Original line number Diff line number Diff line
@@ -26,13 +26,8 @@ cc_defaults { 


cc_library {

    name: "libtrusty",

    vendor: true,

    defaults: ["libtrusty_defaults"],

}



// TODO(b/170753563): cc_fuzz can't deal with vendor components. Build libtrusty

// for system.

cc_test_library {

    name: "libtrusty_test",

    // TODO(b/170753563): cc_fuzz can't deal with vendor components. Build

    // libtrusty for system and vendor.

    vendor_available: true,

    defaults: ["libtrusty_defaults"],

}