android.car.user is not being include on the system elsewhere so we need a static linking
Change-Id: Id8502c76ab2f3eace2f0e4b006e68a2cb0dc9f85
Fixes: 115897136
Test: CarSettingsRoboTests
diff --git a/Android.mk b/Android.mk
index 2e19bb5..9c2b25a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -29,8 +29,7 @@
LOCAL_USE_AAPT2 := true
LOCAL_JAVA_LIBRARIES := \
- android.car \
- android.car.user
+ android.car
LOCAL_STATIC_ANDROID_LIBRARIES := \
androidx.lifecycle_lifecycle-extensions \
@@ -55,7 +54,9 @@
LOCAL_DEX_PREOPT := false
- LOCAL_STATIC_JAVA_LIBRARIES += jsr305
+ LOCAL_STATIC_JAVA_LIBRARIES += \
+ android.car.user \
+ jsr305
LOCAL_DX_FLAGS := --multi-dex