diff options
| author | Colin Cross <ccross@android.com> | 2017-02-15 20:37:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-15 20:37:28 +0000 |
| commit | 0de8a60c880bd6f79501a5ba5744e39b7829a95e (patch) | |
| tree | f896ad5624e846e8abcc5387fb37829fd488f9d6 | |
| parent | d0f276eb48055e1f7b8df445d28d6c37acda3389 (diff) | |
| parent | e1ee607b28cd81e9759c73035b7375fcc3c945f5 (diff) | |
Merge "Add missing transitive dependencies" am: 9a92a189f6
am: e1ee607b28
Change-Id: Ib39f2b1ce5649b15c31a8ea89dec85e543678772
| -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 |