Merge "Do not show an extra confirmation step when sharing lots of contacts Bug:2524537"

[android-x86/packages-apps-Contacts.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index a570324..d574b3f 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,16 +1,16 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE_TAGS := user
+LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_STATIC_JAVA_LIBRARIES := googlelogin-client
+LOCAL_STATIC_JAVA_LIBRARIES := com.android.phone.common
 
 LOCAL_PACKAGE_NAME := Contacts
 LOCAL_CERTIFICATE := shared
 
-LOCAL_STATIC_JAVA_LIBRARIES := googlelogin-client
+LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
 
 include $(BUILD_PACKAGE)