diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 15 |
1 files changed, 14 insertions, 1 deletions
@@ -18,6 +18,8 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) +LOCAL_SRC_FILES += $(call all-java-files-under, ../ContactsCommon/src) +LOCAL_SRC_FILES += $(call all-java-files-under, ../PhoneCommon/src) LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res ifeq ($(TARGET_BUILD_APPS),) @@ -31,6 +33,8 @@ LOCAL_RESOURCE_DIR += frameworks/opt/chips/res LOCAL_RESOURCE_DIR += frameworks/opt/colorpicker/res LOCAL_RESOURCE_DIR += frameworks/opt/photoviewer/res LOCAL_RESOURCE_DIR += frameworks/opt/photoviewer/activity/res +LOCAL_RESOURCE_DIR += packages/apps/ContactsCommon/res +LOCAL_RESOURCE_DIR += packages/apps/PhoneCommon/res LOCAL_JAVA_LIBRARIES += telephony-common @@ -47,6 +51,8 @@ LOCAL_STATIC_JAVA_LIBRARIES += libchips LOCAL_STATIC_JAVA_LIBRARIES += libphotoviewer LOCAL_STATIC_JAVA_LIBRARIES += libphonenumber LOCAL_STATIC_JAVA_LIBRARIES += colorpicker +LOCAL_STATIC_JAVA_LIBRARIES += contacts-picaso +LOCAL_STATIC_JAVA_LIBRARIES += glide include $(LOCAL_PATH)/version.mk @@ -59,6 +65,8 @@ LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips LOCAL_AAPT_FLAGS += --extra-packages com.android.vcard 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 ifdef TARGET_BUILD_APPS LOCAL_JNI_SHARED_LIBRARIES := libframesequence libgiftranscode @@ -66,6 +74,10 @@ else LOCAL_REQUIRED_MODULES:= libframesequence libgiftranscode endif +# utilize ContactsCommon's phone-number-based contact-info lookup +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 LOCAL_PROGUARD_ENABLED := nosystem @@ -83,7 +95,8 @@ LOCAL_PACKAGE_NAME := messaging LOCAL_CERTIFICATE := platform -LOCAL_SDK_VERSION := current +# Causes build errors with ContactsCommon +#LOCAL_SDK_VERSION := current include $(BUILD_PACKAGE) |