summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-02-15 21:39:39 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-15 21:39:39 +0000
commit2cf34c9556c7ac979ed2f117083fbdc1d7aa44f3 (patch)
tree0db7bc858173acfb43fe5d85018844349bbdd776
parent947836e724f756a9fc80ccb366310654de2d8a63 (diff)
parentab0c9e65643621f3474bc2f28c58704cd3c82549 (diff)
downloadandroid_packages_wallpapers_LivePicker-2cf34c9556c7ac979ed2f117083fbdc1d7aa44f3.tar.gz
android_packages_wallpapers_LivePicker-2cf34c9556c7ac979ed2f117083fbdc1d7aa44f3.tar.bz2
android_packages_wallpapers_LivePicker-2cf34c9556c7ac979ed2f117083fbdc1d7aa44f3.zip
Merge "Add missing transitive dependencies" am: ff615e320f am: 5f72eb1464
am: ab0c9e6564 Change-Id: I19a82cfb8850c15f749f3313ded4f7fa944715be
-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)