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

Commit 59f0ea44 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12404440 from 5ceff283 to 24Q4-release 

Change-Id: I1149806638f7edc6f26eff12211f83a4039cfc20
parents 82f254f4 5ceff283

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

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

        "VehicleHalUtils",

        "libgtest",

    ],

    shared_libs: [

        "libjsoncpp",

    ],

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

        "VehicleHalUtils",

        "libgtest",

    ],

    shared_libs: [

        "libjsoncpp",

    ],

    defaults: ["VehicleHalDefaults"],

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

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

        "libgmock",

        "libgtest",

        "libjsoncpp",

    ],

    header_libs: [

        "IVehicleGeneratedHeaders-V4",

    ],

    shared_libs: [

        "libjsoncpp",

    ],

    data: [

        ":VehicleHalDefaultProperties_JSON",

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

        "libgmock",

        "libgtest",

        "libjsoncpp",

    ],

    cflags: [

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

        "IVehicleGeneratedHeaders-V4",

    ],

    shared_libs: [

        "libjsoncpp",

    ],

    data: [

        ":VehicleHalDefaultProperties_JSON",

        ":VehicleHalTestProperties_JSON",

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

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

        "FakeVehicleHalValueGenerators",

        "FakeObd2Frame",

    ],

    shared_libs: [

        "libjsoncpp",

    ],

    data: [

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

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

        "libgtest",

        "libgmock",

        "libjsoncpp",

    ],

    shared_libs: [

        "libgrpc++",

        "libjsoncpp",

        "libprotobuf-cpp-full",

    ],

    data: [

biometrics/common/config/include/config/Config.h

+4 −0
Original line number Diff line number Diff line
@@ -100,7 +100,11 @@ class Config { 
        } else if (std::holds_alternative<OptIntVec>(v)) {

            for (auto x : std::get<OptIntVec>(v))

                if (x.has_value()) os << x.value() << " ";

        } else if (std::holds_alternative<OptString>(v)) {

            OptString ov = std::get<OptString>(v);

            if (ov.has_value()) os << ov.value();

        }



        return os.str();

    }

    std::string toString() const {