commit 84c2744108506abf910fe41314a43e9ace7dd07a
author Narayan Kamath <narayan@google.com> Tue Dec 23 13:49:33 2014 +0000
committer android-build-merger <android-build-merger@google.com> Tue Dec 23 13:49:33 2014 +0000
tree 72c510b071152c47877617aa79672a1b2485ae55
parent 898de6fd8c78d84ae1425e052b27a97ec6f230ad
parent 6d2d7f19a0b9c1172428ef4c79453b9d1e9ed5ca

am 4dcc8d28: am d7771768: Merge "Build against libphonenumber-platform."
automerge: 6d2d7f1

* commit '6d2d7f19a0b9c1172428ef4c79453b9d1e9ed5ca':
  Build against libphonenumber-platform.

Android.mk

diff --git a/Android.mk b/Android.mk
index 1683bdb..76d3a13 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1024,13 +1024,9 @@
 	../../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)
 
@@ -1038,7 +1034,7 @@
 
 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