summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2015-12-11 03:31:09 -0800
committerandroid-build-merger <android-build-merger@google.com>2015-12-11 03:31:09 -0800
commit066ca9f604bf622501891050959380e832d98f63 (patch)
tree1cc632a80f0e80c40878a6c321961d4400276214
parent2151dc2445b6aba5466d522a4db3d900004d284b (diff)
parent2157b405aec26f0434f5d346a8e49895c377facd (diff)
downloadlibphonenumber-066ca9f604bf622501891050959380e832d98f63.tar.gz
Merge "Fix build breakage caused by upgrading to 7.2.1"
am: 2157b405ae * commit '2157b405aec26f0434f5d346a8e49895c377facd': Fix build breakage caused by upgrading to 7.2.1
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 06b970b6..1a44cf97 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.