diff options
| author | Yorke Lee <yorkelee@google.com> | 2012-12-06 16:07:58 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-12-06 16:07:58 -0800 |
| commit | 6bc684123ce922d3ce8b7ab2262fb56c8e1e841f (patch) | |
| tree | 330f46b1f22ff9f975b42028b13753db5f829c68 | |
| parent | 0b2fda3c686c953c27ef52db32a21695daef0007 (diff) | |
| parent | 4f128ea2585910e9c810b38885a79f6873b2456a (diff) | |
Merge "Removing contacts source inclusion from Dialer."
| -rw-r--r-- | Android.mk | 9 | ||||
| -rw-r--r-- | proguard.flags | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk index 68bb86a08..97dfd82d5 100644 --- a/Android.mk +++ b/Android.mk @@ -3,20 +3,17 @@ include $(CLEAR_VARS) 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 d7fefa72f..2447bfd0d 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 |