summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorSai Cheemalapati <saicheems@google.com>2014-06-19 12:30:07 -0700
committerSai Cheemalapati <saicheems@google.com>2014-06-20 10:12:37 -0700
commit9598b51d20cb27acb8dfd47abf2accb612cddb3c (patch)
tree2cb93329244970f5c8fbaa314a4c602adb25a680 /Android.mk
parentbd22a2c7d698fe3fa8cbcdb5e49e6d106355deba (diff)
downloadandroid_packages_apps_Dialer-9598b51d20cb27acb8dfd47abf2accb612cddb3c.tar.gz
android_packages_apps_Dialer-9598b51d20cb27acb8dfd47abf2accb612cddb3c.tar.bz2
android_packages_apps_Dialer-9598b51d20cb27acb8dfd47abf2accb612cddb3c.zip
Update Emergency Dialer to match Dialer (2/5).
Emergency dialer style updated to match style in Dialer and InCallUI. Moved all dialpad resources to PhoneCommon. Change-Id: I69ee95b20b9a6a7007288a754e12ea20763c3842
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 206f00480..c72c0195e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,10 +4,11 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
contacts_common_dir := ../ContactsCommon
+phone_common_dir := ../PhoneCommon
incallui_dir := ../InCallUI
-src_dirs := src $(contacts_common_dir)/src $(incallui_dir)/src
-res_dirs := res $(contacts_common_dir)/res $(incallui_dir)/res
+src_dirs := src $(contacts_common_dir)/src $(incallui_dir)/src $(phone_common_dir)/src
+res_dirs := res $(contacts_common_dir)/res $(incallui_dir)/res $(phone_common_dir)/res
LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
@@ -15,11 +16,11 @@ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
LOCAL_AAPT_FLAGS := \
--auto-add-overlay \
--extra-packages com.android.contacts.common \
- --extra-packages com.android.incallui
+ --extra-packages com.android.incallui \
+ --extra-packages com.android.phone.common
LOCAL_JAVA_LIBRARIES := telephony-common
LOCAL_STATIC_JAVA_LIBRARIES := \
- com.android.phone.shared \
com.android.services.telephony.common \
com.android.vcard \
android-common \