summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2015-12-11 10:34:27 +0000
committerPaul Duffin <paulduffin@google.com>2015-12-11 10:38:55 +0000
commit3bd754c0967ed003578e460faa83ad8e777a636b (patch)
treef92bd88a9bb67e238cdeadde1c0d0ef634abf5bb
parent602589a0db60eb8ae6b8199dc757d43a8ed2158e (diff)
downloadlibphonenumber-3bd754c0967ed003578e460faa83ad8e777a636b.tar.gz
Fix build breakage caused by upgrading to 7.2.1
Moved libprotobuf-java-nano to LOCAL_STATIC_JAVA_LIBRARIES to make sure that it is available to all clients. Bug: 24793335 Change-Id: Iefb21cbd33e2bb0427f8e8687329c3bc8f519eba
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index add96938..dd9be70a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -68,7 +68,7 @@ LOCAL_SRC_FILES := $(libphonenumber_src_files)
LOCAL_JAVA_RESOURCE_DIRS := $(libphonenumber_resource_dirs)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_SDK_VERSION := 9
-LOCAL_JAVA_LIBRARIES := libprotobuf-java-nano
+LOCAL_STATIC_JAVA_LIBRARIES := libprotobuf-java-nano
include $(BUILD_STATIC_JAVA_LIBRARY)
# Tests for unbundled use.