summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-06-20 19:27:14 +0000
committerYorke Lee <yorkelee@google.com>2014-06-20 19:27:14 +0000
commit801d88e55c59414cee422ca0433cec8b1c39d1e6 (patch)
treef9c8c3c56a7d4d23d3dab712139913d34ed3ac89 /Android.mk
parent9598b51d20cb27acb8dfd47abf2accb612cddb3c (diff)
downloadandroid_packages_apps_Dialer-801d88e55c59414cee422ca0433cec8b1c39d1e6.tar.gz
android_packages_apps_Dialer-801d88e55c59414cee422ca0433cec8b1c39d1e6.tar.bz2
android_packages_apps_Dialer-801d88e55c59414cee422ca0433cec8b1c39d1e6.zip
Revert "Update Emergency Dialer to match Dialer (2/5)."
This reverts commit 9598b51d20cb27acb8dfd47abf2accb612cddb3c. Change-Id: I7c2d2b95740888af25b5b257572476b0f20900e3
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk9
1 files changed, 4 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index c72c0195e..206f00480 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,11 +4,10 @@ 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 $(phone_common_dir)/src
-res_dirs := res $(contacts_common_dir)/res $(incallui_dir)/res $(phone_common_dir)/res
+src_dirs := src $(contacts_common_dir)/src $(incallui_dir)/src
+res_dirs := res $(contacts_common_dir)/res $(incallui_dir)/res
LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
@@ -16,11 +15,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.phone.common
+ --extra-packages com.android.incallui
LOCAL_JAVA_LIBRARIES := telephony-common
LOCAL_STATIC_JAVA_LIBRARIES := \
+ com.android.phone.shared \
com.android.services.telephony.common \
com.android.vcard \
android-common \