summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2015-01-06 09:59:47 +0000
committerNarayan Kamath <narayan@google.com>2015-01-06 09:59:47 +0000
commit104e27a881adb8c980b6d13decea4262d68500f5 (patch)
tree51023f66e88e6194bb311d2f1fd60bb0a5b139d5 /Android.mk
parent3e511a90cf0de425a67ccdbd835b5a0ea4dd34c2 (diff)
downloadandroid_packages_apps_ContactsCommon-104e27a881adb8c980b6d13decea4262d68500f5.tar.gz
android_packages_apps_ContactsCommon-104e27a881adb8c980b6d13decea4262d68500f5.tar.bz2
android_packages_apps_ContactsCommon-104e27a881adb8c980b6d13decea4262d68500f5.zip
Revert "Build libphonenumber & libgeocoder from source."
This reverts commit 3e511a90cf0de425a67ccdbd835b5a0ea4dd34c2. Change-Id: Ia0df72732e59d05d81176335f55a2b943835d132
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk12
1 files changed, 11 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 52e18732..626a737b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -34,7 +34,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
android-common \
android-support-v13 \
android-support-v4 \
- libphonenumber
+ libphonenumber \
+ libgeocoding
LOCAL_PACKAGE_NAME := com.android.contacts.common
@@ -43,5 +44,14 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE)
+include $(CLEAR_VARS)
+
+# Open-source libphonenumber libraries as found in code.google.com/p/libphonenumber
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
+ libphonenumber:libs/libphonenumber-6.2.jar \
+ libgeocoding:libs/geocoder-2.9.jar
+
+include $(BUILD_MULTI_PREBUILT)
+
# Use the following include to make our test apk.
include $(call all-makefiles-under,$(LOCAL_PATH))