diff options
| author | Narayan Kamath <narayan@google.com> | 2015-12-10 18:10:03 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-12-10 18:36:11 +0000 |
| commit | af997f5702615400e0094af7db9ae6c3e7ed4759 (patch) | |
| tree | 529d5df6867f2d537362a8ef76ed44e1879d59c3 /Android.mk | |
| parent | 0a9c324169b28cb411c15600cfb7111f13eab539 (diff) | |
| download | libphonenumber-af997f5702615400e0094af7db9ae6c3e7ed4759.tar.gz | |
Revert "Upgrade to version 7.2.1"
This reverts commit 8fda25a631103958dd4e335fa1149913d0552e0a.
(cherry-picked from commit f8e6609c7ee7dd2a0f515a65ceb995e80f7731ee)
Change-Id: I2ae2ec277c1113d67124dec7e2232176b0435396
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 10 |
1 files changed, 4 insertions, 6 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 include $(BUILD_STATIC_JAVA_LIBRARY) # For unbundled use, supports gingerbread and up. @@ -68,13 +67,12 @@ 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 include $(BUILD_STATIC_JAVA_LIBRARY) # Tests for unbundled use. -# vogar --timeout 0 \ - --classpath out/target/common/obj/JAVA_LIBRARIES/libphonenumber-test_intermediates/classes.jar \ - com.google.i18n.phonenumbers +# vogar --timeout 0 --classpath out/target/common/obj/JAVA_LIBRARIES/libphonenumber_intermediates/classes.jar \ +# --classpath out/target/common/obj/JAVA_LIBRARIES/libphonenumber-test_intermediates/classes.jar \ +# com.google.i18n.phonenumbers include $(CLEAR_VARS) LOCAL_MODULE := libphonenumber-test LOCAL_MODULE_TAGS := optional @@ -82,5 +80,5 @@ 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_JAVA_LIBRARIES := libphonenumber include $(BUILD_STATIC_JAVA_LIBRARY) |