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

Commit 774884c4 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libcutils_test: static libjsoncpp" am: 7681f71b am: 5aaff347 am: cebd252f 

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



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

libcutils/Android.bp

+6 −2
Original line number Diff line number Diff line
@@ -286,11 +286,14 @@ cc_defaults { 
    ],

}



always_static_test_libraries = [

    "libjsoncpp",

]



test_libraries = [

    "libcutils",

    "liblog",

    "libbase",

    "libjsoncpp",

    "libprocessgroup",

    "libcgrouprc",

]
@@ -301,6 +304,7 @@ cc_test { 
    defaults: ["libcutils_test_default"],

    host_supported: true,

    shared_libs: test_libraries,

    static_libs: always_static_test_libraries,

    require_root: true,

}
@@ -310,7 +314,7 @@ cc_defaults { 
    static_libs: [

        "libc",

        "libcgrouprc_format",

    ] + test_libraries,

    ] + test_libraries + always_static_test_libraries,

    stl: "libc++_static",

    require_root: true,