Merge "Use static libjsoncpp for unit tests." into main (5ceff283) · Commits · e / os / android_hardware_interfaces

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"],

+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",

+0 −2

Original line number	Diff line number	Diff line
		@@ -28,8 +28,6 @@ cc_test {
		"VehicleHalUtils",
		"FakeVehicleHalValueGenerators",
		"FakeObd2Frame",
		],
		shared_libs: [
		"libjsoncpp",
		],
		data: [

+1 −1