diff --git a/automotive/vehicle/aidl/impl/default_config/JsonConfigLoader/test/Android.bp b/automotive/vehicle/aidl/impl/default_config/JsonConfigLoader/test/Android.bp index abf15c5429..90ea02762e 100644 --- a/automotive/vehicle/aidl/impl/default_config/JsonConfigLoader/test/Android.bp +++ b/automotive/vehicle/aidl/impl/default_config/JsonConfigLoader/test/Android.bp @@ -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"], diff --git a/automotive/vehicle/aidl/impl/default_config/test/Android.bp b/automotive/vehicle/aidl/impl/default_config/test/Android.bp index 52014fb2d1..a88913e66a 100644 --- a/automotive/vehicle/aidl/impl/default_config/test/Android.bp +++ b/automotive/vehicle/aidl/impl/default_config/test/Android.bp @@ -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", diff --git a/automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/test/Android.bp b/automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/test/Android.bp index 4bc0b123de..0d814eafb9 100644 --- a/automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/test/Android.bp +++ b/automotive/vehicle/aidl/impl/fake_impl/GeneratorHub/test/Android.bp @@ -28,8 +28,6 @@ cc_test { "VehicleHalUtils", "FakeVehicleHalValueGenerators", "FakeObd2Frame", - ], - shared_libs: [ "libjsoncpp", ], data: [ diff --git a/automotive/vehicle/aidl/impl/fake_impl/hardware/test/Android.bp b/automotive/vehicle/aidl/impl/fake_impl/hardware/test/Android.bp index 9f002dd7cd..62c114780a 100644 --- a/automotive/vehicle/aidl/impl/fake_impl/hardware/test/Android.bp +++ b/automotive/vehicle/aidl/impl/fake_impl/hardware/test/Android.bp @@ -40,10 +40,10 @@ cc_test { "FakeUserHal", "libgtest", "libgmock", + "libjsoncpp", ], shared_libs: [ "libgrpc++", - "libjsoncpp", "libprotobuf-cpp-full", ], data: [