commit c286ae2cf471a7ddad4ec1e9a00e7bc9c30fdd91
author Santos Cordon <santoscordon@google.com> Tue Sep 03 15:58:07 2013 -0700
committer Santos Cordon <santoscordon@google.com> Wed Sep 04 13:03:45 2013 -0700
tree 2947b27846cdcc1ad102e35cc411bb0fdbcd8a2d
parent f802f432822f3b1e05b1253f51c6c17c8f97b752

Combine InCallUI & Dialer (part 3)

Merge InCallUI code into Dialer.
Adds references to InCallUI code into the Android.mk file and copies
AndroidManifest.xml entries over.

bug:10605332
Change-Id: Ie889f914021fe59aaaf6ff0a4c971028f25b4cf7

Android.mk

diff --git a/Android.mk b/Android.mk
index e0f5310..899d589 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,20 +4,23 @@
 LOCAL_MODULE_TAGS := optional
 
 contacts_common_dir := ../ContactsCommon
+incallui_dir := ../InCallUI
 
-src_dirs := src $(contacts_common_dir)/src
-res_dirs := res $(contacts_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))
 
 LOCAL_AAPT_FLAGS := \
     --auto-add-overlay \
-    --extra-packages com.android.contacts.common
+    --extra-packages com.android.contacts.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 \
     guava \
@@ -31,7 +34,7 @@
 LOCAL_CERTIFICATE := shared
 LOCAL_PRIVILEGED_MODULE := true
 
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags $(incallui_dir)/proguard.flags
 
 include $(BUILD_PACKAGE)