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

Commit 5ceff283 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use static libjsoncpp for unit tests." into main

parents 567b731d 3685883c

automotive/vehicle/aidl/impl/default_config/JsonConfigLoader/test/Android.bp

+0 −4
Original line number Original line Diff line number Diff line
@@ -27,8 +27,6 @@ cc_test { 
        "VehicleHalJsonConfigLoader",

        "VehicleHalJsonConfigLoader",

        "VehicleHalUtils",

        "VehicleHalUtils",

        "libgtest",

        "libgtest",

    ],

    shared_libs: [

        "libjsoncpp",

        "libjsoncpp",

    ],

    ],

    defaults: ["VehicleHalDefaults"],

    defaults: ["VehicleHalDefaults"],
@@ -43,8 +41,6 @@ cc_test { 
        "VehicleHalJsonConfigLoaderEnableTestProperties",

        "VehicleHalJsonConfigLoaderEnableTestProperties",

        "VehicleHalUtils",

        "VehicleHalUtils",

        "libgtest",

        "libgtest",

    ],

    shared_libs: [

        "libjsoncpp",

        "libjsoncpp",

    ],

    ],

    defaults: ["VehicleHalDefaults"],

    defaults: ["VehicleHalDefaults"],

automotive/vehicle/aidl/impl/default_config/test/Android.bp

+2 −6
Original line number Original line Diff line number Diff line
@@ -29,13 +29,11 @@ cc_test { 
        "VehicleHalUtils",

        "VehicleHalUtils",

        "libgmock",

        "libgmock",

        "libgtest",

        "libgtest",

        "libjsoncpp",

    ],

    ],

    header_libs: [

    header_libs: [

        "IVehicleGeneratedHeaders-V4",

        "IVehicleGeneratedHeaders-V4",

    ],

    ],

    shared_libs: [

        "libjsoncpp",

    ],

    data: [

    data: [

        ":VehicleHalDefaultProperties_JSON",

        ":VehicleHalDefaultProperties_JSON",

    ],

    ],
@@ -52,6 +50,7 @@ cc_test { 
        "VehicleHalUtils",

        "VehicleHalUtils",

        "libgmock",

        "libgmock",

        "libgtest",

        "libgtest",

        "libjsoncpp",

    ],

    ],

    cflags: [

    cflags: [

        "-DENABLE_VEHICLE_HAL_TEST_PROPERTIES",

        "-DENABLE_VEHICLE_HAL_TEST_PROPERTIES",
@@ -59,9 +58,6 @@ cc_test { 
    header_libs: [

    header_libs: [

        "IVehicleGeneratedHeaders-V4",

        "IVehicleGeneratedHeaders-V4",

    ],

    ],

    shared_libs: [

        "libjsoncpp",

    ],

    data: [

    data: [

        ":VehicleHalDefaultProperties_JSON",

        ":VehicleHalDefaultProperties_JSON",

        ":VehicleHalTestProperties_JSON",

        ":VehicleHalTestProperties_JSON",

automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/test/Android.bp

+0 −2
Original line number Original line Diff line number Diff line
@@ -28,8 +28,6 @@ cc_test { 
        "VehicleHalUtils",

        "VehicleHalUtils",

        "FakeVehicleHalValueGenerators",

        "FakeVehicleHalValueGenerators",

        "FakeObd2Frame",

        "FakeObd2Frame",

    ],

    shared_libs: [

        "libjsoncpp",

        "libjsoncpp",

    ],

    ],

    data: [

    data: [

automotive/vehicle/aidl/impl/fake_impl/hardware/test/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -40,10 +40,10 @@ cc_test { 
        "FakeUserHal",

        "FakeUserHal",

        "libgtest",

        "libgtest",

        "libgmock",

        "libgmock",

        "libjsoncpp",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "libgrpc++",

        "libgrpc++",

        "libjsoncpp",

        "libprotobuf-cpp-full",

        "libprotobuf-cpp-full",

    ],

    ],

    data: [

    data: [