commit 5f5c1264bb607fcf6742e9d69f053fddc5ec8be2
author Jian Jin <jinjian@google.com> Mon Sep 24 15:44:16 2018 -0700
committer Jian Jin <jinjian@google.com> Mon Sep 24 16:08:15 2018 -0700
tree bb12fef323f04b5b895a5b77f60ba9c58054d309
parent 8bf2cef6b8854a9317d9aa647b6ba48ab97e22bf

android.car.user is not being include on the system elsewhere so we need a static linking

Change-Id: Id8502c76ab2f3eace2f0e4b006e68a2cb0dc9f85
Fixes: 115897136
Test: CarSettingsRoboTests

Android.mk

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