diff options
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 12 |
1 files changed, 7 insertions, 5 deletions
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 := \ |