summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-02-15 20:20:23 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-02-15 20:20:23 +0000
commit9a92a189f67470a6ba636cf1e9f5d093608d9a96 (patch)
treef60a04c23c98b57ea6843225bc102a6571fd87f8
parent1e721c9f30c3e626ba9f084acf764b4dea3afd38 (diff)
parent6afcdf001d32cf88e7eea0265e23cf5feded3378 (diff)
downloadandroid_packages_apps_Dialer-9a92a189f67470a6ba636cf1e9f5d093608d9a96.tar.gz
android_packages_apps_Dialer-9a92a189f67470a6ba636cf1e9f5d093608d9a96.tar.bz2
android_packages_apps_Dialer-9a92a189f67470a6ba636cf1e9f5d093608d9a96.zip
Merge "Add missing transitive dependencies"
-rw-r--r--Android.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 02e075ff3..0978bec05 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,7 +32,8 @@ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \
$(support_library_root_dir)/v7/cardview/res \
$(support_library_root_dir)/v7/recyclerview/res \
$(support_library_root_dir)/v7/appcompat/res \
- $(support_library_root_dir)/design/res
+ $(support_library_root_dir)/design/res \
+ $(support_library_root_dir)/transition/res
LOCAL_AAPT_FLAGS := \
--auto-add-overlay \
@@ -40,6 +41,7 @@ LOCAL_AAPT_FLAGS := \
--extra-packages android.support.v7.cardview \
--extra-packages android.support.v7.recyclerview \
--extra-packages android.support.design \
+ --extra-packages android.support.transition \
--extra-packages com.android.incallui \
--extra-packages com.android.contacts.common \
--extra-packages com.android.phone.common
@@ -52,6 +54,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-v7-cardview \
android-support-v7-recyclerview \
android-support-design \
+ android-support-transition \
com.android.vcard \
guava \
libphonenumber