diff options
| author | Colin Cross <ccross@android.com> | 2015-03-31 17:14:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-31 17:14:26 +0000 |
| commit | a1226563961af54d8c70422c412fc8f5436fae2b (patch) | |
| tree | 2b2a3f7371fba4ce7a66068ac109353e17d1887f | |
| parent | c4facb085955f9ea17af9eb4f5e270c9710bd1f3 (diff) | |
| parent | 8f9292f0f3ed815197ae67d8a8395c1a5efc9b56 (diff) | |
| download | libphonenumber-a1226563961af54d8c70422c412fc8f5436fae2b.tar.gz | |
Merge "Remove -encoding UTF-8, it is now the default"
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -42,7 +42,6 @@ LOCAL_MODULE := libphonenumber-platform LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(libphonenumber_platform_src_files) LOCAL_JAVA_RESOURCE_DIRS := $(libphonenumber_platform_resource_dirs) -LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_NO_STANDARD_LIBRARIES := true @@ -55,7 +54,6 @@ LOCAL_MODULE := libphonenumber LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(libphonenumber_src_files) LOCAL_JAVA_RESOURCE_DIRS := $(libphonenumber_resource_dirs) -LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_SDK_VERSION := 9 include $(BUILD_STATIC_JAVA_LIBRARY) |