commit 86cad37858f17bda6ae008a0a58ea5bf919e859d
author android-build-team Robot <android-build-team-robot@google.com> Sun Apr 15 07:25:59 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Apr 15 07:25:59 2018 +0000
tree cbfc6c133e00bdc055cfa0a710842b79e7e8f965
parent 6fe02d08467b82dbfead93a3b78ae2d0a363ecda
parent 39387e0806d01296295d1313892556ac8f44c240

Snap for 4722539 from 39387e0806d01296295d1313892556ac8f44c240 to pi-release

Change-Id: I512b9c743b825c5a872b82bb8206461d37c6fd96

Android.mk

diff --git a/Android.mk b/Android.mk
index 587ea15..5f790a2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,9 +31,12 @@
 
 LOCAL_OVERRIDES_PACKAGES := LatinIME
 
+LOCAL_JAVA_LIBRARIES += android.car
+
 LOCAL_STATIC_JAVA_LIBRARIES := \
         android-common jsr305
-LOCAL_STATIC_ANDROID_LIBRARIES += android-support-car
+
+LOCAL_STATIC_ANDROID_LIBRARIES += androidx.car_car
 
 # Include all the resources regardless of system supported locales
 LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
@@ -47,8 +50,6 @@
 
 LOCAL_DEX_PREOPT := false
 
-include packages/services/Car/car-support-lib/car-support.mk
-
 include $(BUILD_PACKAGE)
 
 endif