commit 3a8df86541c91ac5023bc46efae4ed23502512fa
author Chiao Cheng <chiaocheng@google.com> Tue Sep 04 16:30:17 2012 -0700
committer Chiao Cheng <chiaocheng@google.com> Wed Sep 05 17:07:02 2012 -0700
tree 88d8dd2a7f04954b20cc2ef4bc492b2b16220be4
parent 9344bfcefc167dae102656378b4c92eea0d051a5

Additional clean-up of dialer split.

- Moving resource only used by dialer.
- Moving out common utilities.

Bug: 6993891
Change-Id: Ieb851adb1d6a3492290b84a56aa2cd00cae2f260

Android.mk

diff --git a/Android.mk b/Android.mk
index 1ac5fd3..d04a68a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,7 +3,17 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+contacts_common_dir := ../ContactsCommon
+
+src_dirs := src $(contacts_common_dir)/src
+res_dirs := res $(contacts_common_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
 
 LOCAL_JAVA_LIBRARIES := telephony-common
 LOCAL_STATIC_JAVA_LIBRARIES := \