summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-02-15 21:32:38 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-15 21:32:38 +0000
commit5f72eb1464ef67efb8d83bcd9f9dc7bc9018cf49 (patch)
tree22267938fcadeb705f676448a9be3c1b5be8c557
parentd7e58d608a8e6d63d7582473a1f4fd5de316851f (diff)
parentff615e320f7d3c784c54b8de72e841e974a160bf (diff)
downloadandroid_packages_wallpapers_LivePicker-5f72eb1464ef67efb8d83bcd9f9dc7bc9018cf49.tar.gz
android_packages_wallpapers_LivePicker-5f72eb1464ef67efb8d83bcd9f9dc7bc9018cf49.tar.bz2
android_packages_wallpapers_LivePicker-5f72eb1464ef67efb8d83bcd9f9dc7bc9018cf49.zip
Merge "Add missing transitive dependencies"
am: ff615e320f Change-Id: I2ee95031f0ae8d8c274daf60bde09fb2edc480ae
-rw-r--r--Android.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 2460ff9..885e474 100644
--- a/Android.mk
+++ b/Android.mk
@@ -49,15 +49,19 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-v7-appcompat \
android-support-v4 \
- android-support-design
+ android-support-design \
+ android-support-transition \
+ android-support-v7-recyclerview
LOCAL_RESOURCE_DIR := \
$(LOCAL_PATH)/res \
frameworks/support/v7/appcompat/res \
frameworks/support/design/res \
+ frameworks/support/transition/res \
LOCAL_AAPT_FLAGS := --auto-add-overlay \
--extra-packages android.support.design \
- --extra-packages android.support.v7.appcompat
+ --extra-packages android.support.v7.appcompat \
+ --extra-packages android.support.transition
include $(BUILD_PACKAGE)