diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-12 21:59:14 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-12 21:59:14 +0100 |
| commit | 5b344b62354a8b57b9feff5533aa2cdae398e0e1 (patch) | |
| tree | bf134fd40449d7e4386d8ad40934af661ea08821 /Android.mk | |
| parent | 07b429d6cedbf3698b1e11680a8f281e63c37a1e (diff) | |
| download | packages_apps_Messaging-5b344b62354a8b57b9feff5533aa2cdae398e0e1.zip packages_apps_Messaging-5b344b62354a8b57b9feff5533aa2cdae398e0e1.tar.gz packages_apps_Messaging-5b344b62354a8b57b9feff5533aa2cdae398e0e1.tar.bz2 | |
Revert "Add maps preview for addresses and integrate ridesharing request into Messaging"replicant-6.0-beta-0001replicant-6.0-alpha-0006
This reverts commit 1a3b89e56b63270c0394f5b50cd4ce3081c1f7ee.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -51,7 +51,6 @@ LOCAL_STATIC_JAVA_LIBRARIES += guava LOCAL_STATIC_JAVA_LIBRARIES += libchips LOCAL_STATIC_JAVA_LIBRARIES += libphotoviewer LOCAL_STATIC_JAVA_LIBRARIES += libphonenumber -LOCAL_STATIC_JAVA_LIBRARIES += play LOCAL_STATIC_JAVA_LIBRARIES += colorpicker LOCAL_STATIC_JAVA_LIBRARIES += contacts-picaso @@ -68,7 +67,6 @@ LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.photo LOCAL_AAPT_FLAGS += --extra-packages com.android.colorpicker LOCAL_AAPT_FLAGS += --extra-packages com.android.contacts.common LOCAL_AAPT_FLAGS += --extra-packages com.android.phone.common -LOCAT_AAPT_FLAGS += --extra-packages com.google.android.gms ifdef TARGET_BUILD_APPS LOCAL_JNI_SHARED_LIBRARIES := libframesequence libgiftranscode @@ -77,7 +75,11 @@ else endif # utilize ContactsCommon's phone-number-based contact-info lookup -include $(LOCAL_PATH)/../ContactsCommon/info_lookup/phonenumber_lookup_provider.mk +ifeq ($(contacts_common_dir),) + contacts_common_dir := ../ContactsCommon +endif +CONTACTS_COMMON_LOOKUP_PROVIDER ?= $(LOCAL_PATH)/$(contacts_common_dir)/info_lookup +include $(CONTACTS_COMMON_LOOKUP_PROVIDER)/phonenumber_lookup_provider.mk LOCAL_PROGUARD_FLAGS := -ignorewarnings -include build/core/proguard_basic_keeps.flags |