summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-02-15 21:36:06 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-02-15 21:36:06 +0000
commitab0c9e65643621f3474bc2f28c58704cd3c82549 (patch)
treeabe850996c9eef2ff4248e7cbdac4c85f50a21a0
parentf8eadaee18448905a55a8aa24c0dd5a7b8cd5cb6 (diff)
parent5f72eb1464ef67efb8d83bcd9f9dc7bc9018cf49 (diff)
downloadandroid_packages_wallpapers_LivePicker-ab0c9e65643621f3474bc2f28c58704cd3c82549.tar.gz
android_packages_wallpapers_LivePicker-ab0c9e65643621f3474bc2f28c58704cd3c82549.tar.bz2
android_packages_wallpapers_LivePicker-ab0c9e65643621f3474bc2f28c58704cd3c82549.zip
Merge "Add missing transitive dependencies" am: ff615e320f
am: 5f72eb1464 Change-Id: Id735fba8af2e16ee1e851684e963100830785230
-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)