commit 1937f9a9b1b712cc075f6d2e9f0c023d001f0921
author Srinivas Visvanathan <sriniv@google.com> Wed Dec 07 21:48:21 2016 -0800
committer Srinivas Visvanathan <sriniv@google.com> Wed Dec 07 21:48:21 2016 -0800
tree 74a3355e89d0381b4f1ff14e64026b3186e2e84f
parent f304f0a68ff116f402523d2f35f4382797e33d68

Including v7-appcompat conditionally

Bug: 32019250
Test: Manually
Change-Id: I16b122a7c1e14a376d37a7f55627dcf3098acce5

Android.mk

diff --git a/Android.mk b/Android.mk
index 33040d3..d213ed2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -34,8 +34,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res \
-        frameworks/support/design/res \
-        frameworks/support/v7/appcompat/res
+        frameworks/support/design/res
 
 LOCAL_PACKAGE_NAME := LocalMediaPlayer
 
@@ -47,12 +46,17 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 \
         android-support-design \
-        android-support-v7-appcompat \
         car-stream-lib \
         LocalMediaPlayer-proto
 
-LOCAL_AAPT_FLAGS += --extra-packages android.support.design \
-        --extra-packages android.support.v7.appcompat
+LOCAL_AAPT_FLAGS += --extra-packages android.support.design
+
+# 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
+endif
 
 LOCAL_PROGUARD_ENABLED := disabled