diff options
| author | Erica Chang <echang@cyngn.com> | 2016-04-26 22:11:41 -0700 |
|---|---|---|
| committer | Erica Chang <echang@cyngn.com> | 2016-04-27 14:11:41 -0700 |
| commit | ff1025e27a70eaedd573329e32c2b907942f851d (patch) | |
| tree | b45114d3b1ad31b248aac3be30c3e8ea93e33e06 /Android.mk | |
| parent | a8593b070835820e7504cfc740cefd287b1a1ec5 (diff) | |
| download | packages_apps_Contacts-ff1025e27a70eaedd573329e32c2b907942f851d.tar.gz packages_apps_Contacts-ff1025e27a70eaedd573329e32c2b907942f851d.tar.bz2 packages_apps_Contacts-ff1025e27a70eaedd573329e32c2b907942f851d.zip | |
[2/2] Contacts : fixed InCall plugin PendingIntent after refactor
-Addressed contact card not reflecting InCall plugin status/auth state
change
-Added error Snackbar message in case invite and directory search
PendingIntents are null
CD-550,CD-588
Change-Id: I2ba66a98d13f982fe13563439afd5f785ab0f16c
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 7d623408d..5ac8d24b1 100644 --- a/Android.mk +++ b/Android.mk @@ -14,20 +14,23 @@ res_dirs := res $(contacts_common_dir)/res $(phone_common_dir)/res LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \ - frameworks/support/v7/cardview/res + frameworks/support/v7/cardview/res \ + external/uicommon/res LOCAL_AAPT_FLAGS := \ --auto-add-overlay \ --extra-packages com.android.contacts.common \ --extra-packages com.android.phone.common \ --extra-packages android.support.v7.cardview \ - --extra-packages com.cyanogen.ambient + --extra-packages com.cyanogen.ambient \ + --extra-packages com.cyngn.uicommon LOCAL_JAVA_LIBRARIES := telephony-common voip-common ims-common LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest_cm.xml LOCAL_STATIC_JAVA_LIBRARIES := \ com.android.vcard \ android-common \ + uicommon \ guava \ android-support-v13 \ android-support-v7-cardview \ |