Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84c27441 authored by Narayan Kamath's avatar Narayan Kamath Committed by android-build-merger
Browse files

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

automerge: 6d2d7f19

* commit '6d2d7f19':
  Build against libphonenumber-platform.
parents 898de6fd 6d2d7f19
Loading
Loading
Loading
Loading
+1 −5
Original line number Original line Diff line number Diff line
@@ -1024,13 +1024,9 @@ ext_dirs := \
	../../external/nist-sip/java \
	../../external/nist-sip/java \
	../../external/apache-http/src \
	../../external/apache-http/src \
	../../external/tagsoup/src \
	../../external/tagsoup/src \
	../../external/libphonenumber/java/src


ext_src_files := $(call all-java-files-under,$(ext_dirs))
ext_src_files := $(call all-java-files-under,$(ext_dirs))


ext_res_dirs := \
	../../external/libphonenumber/java/src

# ====  the library  =========================================
# ====  the library  =========================================
include $(CLEAR_VARS)
include $(CLEAR_VARS)


@@ -1038,7 +1034,7 @@ LOCAL_SRC_FILES := $(ext_src_files)


LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := core-libart
LOCAL_JAVA_LIBRARIES := core-libart
LOCAL_JAVA_RESOURCE_DIRS := $(ext_res_dirs)
LOCAL_STATIC_JAVA_LIBRARIES := libphonenumber-platform
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := ext
LOCAL_MODULE := ext