diff options
| author | Narayan Kamath <narayan@google.com> | 2014-12-23 13:47:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-23 13:47:50 +0000 |
| commit | 6d2d7f19a0b9c1172428ef4c79453b9d1e9ed5ca (patch) | |
| tree | 646847a3995fff804d53c5ec358eeecf38b302bd /Android.mk | |
| parent | 83cfb97323469e3370840c6cefb5689ab2059025 (diff) | |
| parent | 4dcc8d28d7933a4a08d2330f78f3b4486d2ef264 (diff) | |
| download | frameworks_base-6d2d7f19a0b9c1172428ef4c79453b9d1e9ed5ca.zip frameworks_base-6d2d7f19a0b9c1172428ef4c79453b9d1e9ed5ca.tar.gz frameworks_base-6d2d7f19a0b9c1172428ef4c79453b9d1e9ed5ca.tar.bz2 | |
am 4dcc8d28: am d7771768: Merge "Build against libphonenumber-platform."
* commit '4dcc8d28d7933a4a08d2330f78f3b4486d2ef264':
Build against libphonenumber-platform.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -1011,13 +1011,9 @@ ext_dirs := \ ../../external/nist-sip/java \ ../../external/apache-http/src \ ../../external/tagsoup/src \ - ../../external/libphonenumber/java/src ext_src_files := $(call all-java-files-under,$(ext_dirs)) -ext_res_dirs := \ - ../../external/libphonenumber/java/src - # ==== the library ========================================= include $(CLEAR_VARS) @@ -1025,7 +1021,7 @@ LOCAL_SRC_FILES := $(ext_src_files) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := core-libart -LOCAL_JAVA_RESOURCE_DIRS := $(ext_res_dirs) +LOCAL_STATIC_JAVA_LIBRARIES := libphonenumber-platform LOCAL_MODULE_TAGS := optional LOCAL_MODULE := ext |