Use static libjsoncpp for unit tests.
The test environment might miss the shared libjsoncpp lib.
Flag: EXEMPT test
Test: Presubmit
Bug: 368371598
Change-Id: I30915c907c06f577d6428af8aa745dd94c674dc1
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 abf15c5..90ea027 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 @@
"VehicleHalJsonConfigLoader",
"VehicleHalUtils",
"libgtest",
- ],
- shared_libs: [
"libjsoncpp",
],
defaults: ["VehicleHalDefaults"],
@@ -43,8 +41,6 @@
"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 52014fb..a88913e 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 @@
"VehicleHalUtils",
"libgmock",
"libgtest",
+ "libjsoncpp",
],
header_libs: [
"IVehicleGeneratedHeaders-V4",
],
- shared_libs: [
- "libjsoncpp",
- ],
data: [
":VehicleHalDefaultProperties_JSON",
],
@@ -52,6 +50,7 @@
"VehicleHalUtils",
"libgmock",
"libgtest",
+ "libjsoncpp",
],
cflags: [
"-DENABLE_VEHICLE_HAL_TEST_PROPERTIES",
@@ -59,9 +58,6 @@
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 4bc0b12..0d814ea 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 @@
"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 9f002dd..62c1147 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 @@
"FakeUserHal",
"libgtest",
"libgmock",
+ "libjsoncpp",
],
shared_libs: [
"libgrpc++",
- "libjsoncpp",
"libprotobuf-cpp-full",
],
data: [