From 9d4f3b20793a007b4489547aa40fc1049d0d8fef Mon Sep 17 00:00:00 2001
From: Chiao Cheng <chiaocheng@google.com>
Date: Wed, 5 Sep 2012 16:00:16 -0700
Subject: Moving resources from Contacts to Dialer.

- Also moving some shared utilities.

Bug: 6993891
Change-Id: I5fa18d26e4f5423f4d3f3450b8f3e3dacbfb947a
---
 Android.mk | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index b41c394ee..68bb86a08 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,18 +3,20 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
-# This should become ContactsCommon
-contacts_common_dir := ../Contacts
+# all common code should eventually move to ContactsCommon and contacts should be removed
+# as a dependency.
+contacts_dir := ../Contacts
+contacts_common_dir := ../ContactsCommon
 
-src_dirs := src $(contacts_common_dir)/src
-res_dirs := res $(contacts_common_dir)/res
+src_dirs := src $(contacts_common_dir)/src $(contacts_dir)/src
+res_dirs := res $(contacts_common_dir)/res $(contacts_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
+    --extra-packages com.android.contacts:com.android.contacts.common
 
 LOCAL_JAVA_LIBRARIES := telephony-common
 LOCAL_STATIC_JAVA_LIBRARIES := \
-- 
cgit v1.2.3