From 9598b51d20cb27acb8dfd47abf2accb612cddb3c Mon Sep 17 00:00:00 2001
From: Sai Cheemalapati <saicheems@google.com>
Date: Thu, 19 Jun 2014 12:30:07 -0700
Subject: 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
---
 Android.mk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'Android.mk')

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 \
-- 
cgit v1.2.3