diff options
| author | Zhao Wei Liew <zhaoweiliew@gmail.com> | 2017-02-19 11:18:25 +0800 |
|---|---|---|
| committer | Zhao Wei Liew <zhaoweiliew@gmail.com> | 2017-02-19 11:21:12 +0800 |
| commit | a2766da1f197496e45234c7a2c3c18a81f804fc8 (patch) | |
| tree | 075bc44f6947a35c91c7e97138053e57f3986d2b /Android.mk | |
| parent | f2597ce36785fda486fa7a911ec05147adcbbffe (diff) | |
| download | android_packages_apps_Messaging-a2766da1f197496e45234c7a2c3c18a81f804fc8.tar.gz android_packages_apps_Messaging-a2766da1f197496e45234c7a2c3c18a81f804fc8.tar.bz2 android_packages_apps_Messaging-a2766da1f197496e45234c7a2c3c18a81f804fc8.zip | |
Revert "Add maps preview for addresses and integrate ridesharing request into Messaging"
Get rid of dependencies on the ambient SDK.
This reverts commit 1a3b89e56b63270c0394f5b50cd4ce3081c1f7ee.
Change-Id: Iad616b41bbeb71a785f45fa4a359fe305099ade0
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 |