diff options
| author | Colin Cross <ccross@android.com> | 2015-03-31 17:14:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-31 17:14:45 +0000 |
| commit | 9fa0698523b8a573b8862c0e62c533be8bd53bda (patch) | |
| tree | 32b4bbe21a10d69cdbd0502137f4515f9b73f241 | |
| parent | 56d34066c10aec853a2629b9ad09d48e43e11e42 (diff) | |
| parent | 7c1c907bb6610a3efcf7d6c6936289961896efe0 (diff) | |
| download | platform_external_okhttp-9fa0698523b8a573b8862c0e62c533be8bd53bda.tar.gz platform_external_okhttp-9fa0698523b8a573b8862c0e62c533be8bd53bda.tar.bz2 platform_external_okhttp-9fa0698523b8a573b8862c0e62c533be8bd53bda.zip | |
Merge "Remove -encoding UTF-8, it is now the default"android-wear-5.1.1_r1android-wear-5.1.0_r1
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -34,7 +34,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := okhttp LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(okhttp_system_src_files) -LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_JAVA_LIBRARIES := core-libart conscrypt LOCAL_NO_STANDARD_LIBRARIES := true @@ -46,7 +45,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := okhttp-nojarjar LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(okhttp_system_src_files) -LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_JAVA_LIBRARIES := core-libart conscrypt LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk @@ -56,7 +54,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := okhttp-tests-nojarjar LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(okhttp_test_src_files) -LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_JAVA_LIBRARIES := core-libart okhttp-nojarjar junit4-target bouncycastle-nojarjar conscrypt LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk @@ -67,7 +64,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := okhttp-hostdex LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(okhttp_system_src_files) -LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_JAVA_LIBRARIES := conscrypt-hostdex LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk |