diff options
| author | Colin Cross <ccross@android.com> | 2015-03-31 17:14:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-31 17:14:43 +0000 |
| commit | b44aff7a3b88138f0070630d467c7527cd90c2f3 (patch) | |
| tree | c050e8e909f48fbb611d4cc57eb2279410f503e7 | |
| parent | 75c094164ecc6ffaecd985b06edd60562fbf084b (diff) | |
| parent | e87e402b12e4eefac521667cad82677ba646cf7d (diff) | |
| download | android_external_bouncycastle-b44aff7a3b88138f0070630d467c7527cd90c2f3.tar.gz android_external_bouncycastle-b44aff7a3b88138f0070630d467c7527cd90c2f3.tar.bz2 android_external_bouncycastle-b44aff7a3b88138f0070630d467c7527cd90c2f3.zip | |
Merge "Remove -encoding UTF-8, it is now the default"
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -38,7 +38,6 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_MODULE := bouncycastle LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(android_bcprov_src_files) - LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_JAVA_LIBRARIES := core-libart conscrypt LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt @@ -50,7 +49,6 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_MODULE := bouncycastle-nojarjar LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(android_bcprov_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 @@ -62,7 +60,6 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_MODULE_TAGS := optional LOCAL_SDK_VERSION := 9 LOCAL_SRC_FILES := $(ri_bcprov_src_files) - LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_MODULE_TAGS := optional LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY) @@ -116,7 +113,6 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_MODULE := bouncycastle-hostdex LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(all_bcprov_src_files) - LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_MODULE_TAGS := optional LOCAL_JAVA_LIBRARIES := conscrypt-hostdex LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt @@ -129,7 +125,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := bouncycastle-host LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(ri_bcprov_src_files) -LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_MODULE_TAGS := optional LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_HOST_JAVA_LIBRARY) @@ -138,7 +133,6 @@ include $(CLEAR_VARS) LOCAL_MODULE := bouncycastle-bcpkix-host LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under,bcpkix/src/main/java) -LOCAL_JAVACFLAGS := -encoding UTF-8 LOCAL_MODULE_TAGS := optional LOCAL_JAVA_LIBRARIES := bouncycastle-host LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk |