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

Commit 447b4a4b authored by Steven Moreland's avatar Steven Moreland
Browse files

libcutils_test: static libjsoncpp 

The 32-bit variant of libjsoncpp is not always installed
on 64-bit devices, so it must always be statically included.

We should probably collapse libcutils_test with
libcutils_test_static in the future.

Bug: 285357054
Test: libcutils_test
Merged-In: Ic84901ce5af766338b2cab07c3cf10841ba9a150
Change-Id: Ic84901ce5af766338b2cab07c3cf10841ba9a150
parent b8805786

libcutils/Android.bp

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

}



always_static_test_libraries = [

    "libjsoncpp",

]



test_libraries = [

    "libcutils",

    "liblog",

    "libbase",

    "libjsoncpp",

    "libprocessgroup",

    "libcgrouprc",

]
@@ -317,6 +320,7 @@ cc_test { 
    defaults: ["libcutils_test_default"],

    host_supported: true,

    shared_libs: test_libraries,

    static_libs: always_static_test_libraries,

    require_root: true,

}
@@ -326,7 +330,7 @@ cc_defaults { 
    static_libs: [

        "libc",

        "libcgrouprc_format",

    ] + test_libraries,

    ] + test_libraries + always_static_test_libraries,

    stl: "libc++_static",

    require_root: true,