diff options
| author | Colin Cross <ccross@android.com> | 2015-03-31 17:36:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-31 17:36:11 +0000 |
| commit | cc580f9c349a48890d1e26fb817330d3cc276554 (patch) | |
| tree | 32b4bbe21a10d69cdbd0502137f4515f9b73f241 | |
| parent | cbffba3f477e8f899bcdf0bd1380bc537327a98f (diff) | |
| parent | 9fa0698523b8a573b8862c0e62c533be8bd53bda (diff) | |
| download | okhttp-cc580f9c349a48890d1e26fb817330d3cc276554.tar.gz | |
am 9fa06985: Merge "Remove -encoding UTF-8, it is now the default"
* commit '9fa0698523b8a573b8862c0e62c533be8bd53bda':
Remove -encoding UTF-8, it is now the default
| -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 |