commit 5b2ef4c3704a409a607e52e63b919ede56b94316
author Ying Zheng <yizheng@google.com> Thu Nov 01 10:54:58 2018 -0700
committer Ying Zheng <yizheng@google.com> Thu Nov 01 10:54:58 2018 -0700
tree a434a9a7da21648bb63da4a60dcbb1b3998c30b5
parent ba08440a40959f00d561db12ff5fac114bea90a8

Clean up car user lib in Car Settings.

Bug: 118821773
Test: build
Change-Id: I147b14d02f08620f7ce2a417ebb28feb01f755ae

Android.mk

diff --git a/Android.mk b/Android.mk
index 77e272d..1e060ad 100644
--- a/Android.mk
+++ b/Android.mk
@@ -55,7 +55,7 @@
   LOCAL_DEX_PREOPT := false
 
   LOCAL_STATIC_JAVA_LIBRARIES := \
-      android.car.user \
+      android.car.userlib \
       androidx-constraintlayout_constraintlayout-solver \
       jsr305
 
@@ -86,8 +86,7 @@
   LOCAL_USE_AAPT2 := true
 
   LOCAL_JAVA_LIBRARIES := \
-      android.car \
-      android.car.user
+      android.car
 
   LOCAL_STATIC_ANDROID_LIBRARIES := \
       androidx.car_car \
@@ -114,7 +113,7 @@
   LOCAL_DEX_PREOPT := false
 
   LOCAL_STATIC_JAVA_LIBRARIES := \
-      android.car.user \
+      android.car.userlib \
       androidx-constraintlayout_constraintlayout-solver \
       jsr305