diff options
| author | Colin Cross <ccross@android.com> | 2017-02-15 21:54:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-15 21:54:23 +0000 |
| commit | c684af72f36f3e88a8dc5e116680b3eb2ad36ed2 (patch) | |
| tree | 29e43320805fcf18cac8dfa7b899319f372e89bc | |
| parent | 5d9bb65cc54fb298195d9b8ad64ff1d2fd0e17c8 (diff) | |
| parent | 999536c0c72b266924d7f64937a5e53c511dfb3b (diff) | |
Merge "Add missing transitive dependencies" am: 9a92a189f6 am: e1ee607b28 am: 0de8a60c88
am: 999536c0c7
Change-Id: I5d8a479a50bd53edfc96637dfb3281bb01120faf
| -rw-r--r-- | Android.mk | 5 |
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 |