commit dcc4e38d1d67878bb2b4ee99c7cf9d9a387aaef7
author Anton Hansson <hansson@google.com> Fri Feb 23 07:41:08 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 23 07:41:08 2018 +0000
tree db39eb07fda432a05240d4ecbce450ea4a3ae630
parent 9dca527f9cdcfe92fd198e193d909dc6df5f962d
parent f026ad6a0b7442a6036bf5de79e4af5615eb7389

packages/apps/Car/LocalMediaPlayer: Set LOCAL_SDK_VERSION where possible. am: 4b688e36da am: 979626b0e6
am: f026ad6a0b

Change-Id: I8e3a4a892871eb1d1c2aeff151549605c041cfca

Android.mk

diff --git a/Android.mk b/Android.mk
index 55ea1f4..f1bc1df 100644
--- a/Android.mk
+++ b/Android.mk
@@ -49,20 +49,17 @@
 include packages/apps/Car/libs/car-stream-ui-lib/car-stream-ui-lib.mk
 
 LOCAL_STATIC_JAVA_LIBRARIES += \
-        car-stream-lib \
         LocalMediaPlayer-proto
 
 LOCAL_STATIC_ANDROID_LIBRARIES := \
         android-support-v4 \
-        android-support-design
+        $(ANDROID_SUPPORT_DESIGN_TARGETS)
 
 LOCAL_USE_AAPT2 := true
 
 # Include support-v7-appcompat, if not already included
-ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_JAVA_LIBRARIES)))
-LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res
-LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
+ifeq (,$(findstring android-support-v7-appcompat,$(LOCAL_STATIC_ANDROID_LIBRARIES)))
+LOCAL_STATIC_ANDROID_LIBRARIES += android-support-v7-appcompat
 endif
 
 LOCAL_PROGUARD_ENABLED := disabled