commit 302238e91402e196dac8ef92749499bcf6b6ca70
author android-build-team Robot <android-build-team-robot@google.com> Thu Apr 05 07:24:18 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Apr 05 07:24:18 2018 +0000
tree 9a15dfec23d8fc0b718fb62f7859a9f254e91b9b
parent bd7bf34eeb6e509543d4b99a989159ac7fa1aa5f
parent 3ea9448f8d88173240440f85a739195c353de9ee

Snap for 4701683 from 3ea9448f8d88173240440f85a739195c353de9ee to pi-release

Change-Id: If59141ff38a3a5cde924f3df8c35fb3589f9f9cb

Android.mk

diff --git a/Android.mk b/Android.mk
index f1bc1df..59973fe 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,22 +46,15 @@
 
 LOCAL_PRIVILEGED_MODULE := true
 
-include packages/apps/Car/libs/car-stream-ui-lib/car-stream-ui-lib.mk
-
 LOCAL_STATIC_JAVA_LIBRARIES += \
         LocalMediaPlayer-proto
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
-        android-support-v4 \
-        $(ANDROID_SUPPORT_DESIGN_TARGETS)
+        android-support-car \
+        android-support-v4
 
 LOCAL_USE_AAPT2 := true
 
-# Include support-v7-appcompat, if not already included
-ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_ANDROID_LIBRARIES)))
-LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-appcompat
-endif
-
 LOCAL_PROGUARD_ENABLED := disabled
 
 LOCAL_DEX_PREOPT := false