From e87e402b12e4eefac521667cad82677ba646cf7d Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 30 Mar 2015 17:23:29 -0700 Subject: Remove -encoding UTF-8, it is now the default Change-Id: I29b98f58280168eb4469c223fd12a4314cd6f852 --- Android.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Android.mk b/Android.mk index 37a212a..b531ac8 100644 --- a/Android.mk +++ b/Android.mk @@ -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 -- cgit v1.2.3