Create a new car service lib just for the test lib
The current car-service-lib-for-test statically links all of its deps.
This is not desirable for the car-test-lib as it's meant to test
external apps. The added car-service-test-lib dynamically
links its deps. There needs to be some follow up work to further reduce
the dependncy on the entire car-service-lib, to just include the
functionality needed by the car-test-lib.
Test: make -jN RunCarLibTests
Change-Id: Ia0cc41dcf79748433e7307f6bbc6ddb9900be2a0
diff --git a/tests/EmbeddedKitchenSinkApp/Android.mk b/tests/EmbeddedKitchenSinkApp/Android.mk
index 18a6943..923252d 100644
--- a/tests/EmbeddedKitchenSinkApp/Android.mk
+++ b/tests/EmbeddedKitchenSinkApp/Android.mk
@@ -41,7 +41,7 @@
LOCAL_DEX_PREOPT := false
LOCAL_STATIC_ANDROID_LIBRARIES += \
- car-service-lib-for-test \
+ car-service-test-static-lib \
com.google.android.material_material \
androidx.appcompat_appcompat \
androidx.car_car
diff --git a/tests/carservice_test/Android.mk b/tests/carservice_test/Android.mk
index 813883d..ffb8586 100644
--- a/tests/carservice_test/Android.mk
+++ b/tests/carservice_test/Android.mk
@@ -44,7 +44,7 @@
androidx.test.rules \
android.hardware.automotive.vehicle-V2.0-java \
car-frameworks-service \
- car-service-lib-for-test \
+ car-service-test-static-lib \
car-systemtest \
com.android.car.test.utils \
mockito-target-extended \
diff --git a/tests/carservice_unit_test/Android.mk b/tests/carservice_unit_test/Android.mk
index d4df44e..b5e016f 100644
--- a/tests/carservice_unit_test/Android.mk
+++ b/tests/carservice_unit_test/Android.mk
@@ -52,7 +52,7 @@
androidx.test.ext.junit \
androidx.test.rules \
car-frameworks-service \
- car-service-lib-for-test \
+ car-service-test-static-lib \
com.android.car.test.utils \
frameworks-base-testutils \
mockito-target-extended \