Merge "Removing contacts source inclusion from Dialer."
diff --git a/Android.mk b/Android.mk
index 68bb86a..97dfd82 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,20 +3,17 @@
LOCAL_MODULE_TAGS := optional
-# 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 $(contacts_dir)/src
-res_dirs := res $(contacts_common_dir)/res $(contacts_dir)/res
+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:com.android.contacts.common
+ --extra-packages com.android.contacts.common
LOCAL_JAVA_LIBRARIES := telephony-common
LOCAL_STATIC_JAVA_LIBRARIES := \
diff --git a/proguard.flags b/proguard.flags
index d7fefa7..2447bfd 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -7,10 +7,10 @@
# Any class or method annotated with NeededForTesting or NeededForReflection.
-keep @com.android.contacts.common.test.NeededForTesting class *
--keep @com.android.contacts.test.NeededForReflection class *
+-keep @com.android.dialer.test.NeededForReflection class *
-keepclassmembers class * {
@com.android.contacts.common.test.NeededForTesting *;
-@com.android.contacts.test.NeededForReflection *;
+@com.android.dialer.test.NeededForReflection *;
}
-verbose
