diff options
author | Paul Duffin <paulduffin@google.com> | 2016-09-20 13:59:24 +0100 |
---|---|---|
committer | Paul Duffin <paulduffin@google.com> | 2016-09-20 16:13:56 +0100 |
commit | edd65d0141c2d36a410335316d62a82f1f305eca (patch) | |
tree | dcd4d8079e9465432536b46d12c18810ede3f554 /Android.mk | |
parent | 444b6caeb53aaec736cba729c2445d885a56cb38 (diff) | |
download | libphonenumber-edd65d0141c2d36a410335316d62a82f1f305eca.tar.gz |
Upgrade to libphonenumber-7.7.0 which is nano proto free
Bug: 31608797
Test: Rebuilt and ran android.telephony.cts.PhoneNumberUtilsTest
Change-Id: Ia5beb5c0ff189577c3eb76cc4f2c4e5d243ae97d
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -57,7 +57,6 @@ LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := core-oj core-libart -LOCAL_STATIC_JAVA_LIBRARIES := libprotobuf-java-nano LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_STATIC_JAVA_LIBRARY) @@ -69,7 +68,6 @@ 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_STATIC_JAVA_LIBRARIES := libprotobuf-java-nano LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_STATIC_JAVA_LIBRARY) @@ -84,6 +82,6 @@ LOCAL_SRC_FILES := $(libphonenumber_test_files) LOCAL_JAVA_RESOURCE_DIRS := $(libphonenumber_test_resource_dirs) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_SDK_VERSION := current -LOCAL_STATIC_JAVA_LIBRARIES := libphonenumber libprotobuf-java-nano +LOCAL_STATIC_JAVA_LIBRARIES := libphonenumber LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_STATIC_JAVA_LIBRARY) |