summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2015-03-31 17:43:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-31 17:43:28 +0000
commitbf9fc13901d0666be69118222a1eb0161202af5f (patch)
treec050e8e909f48fbb611d4cc57eb2279410f503e7
parent6d4b5976ada19330b2f7c060b2a81675771d126c (diff)
parentb44aff7a3b88138f0070630d467c7527cd90c2f3 (diff)
downloadandroid_external_bouncycastle-bf9fc13901d0666be69118222a1eb0161202af5f.tar.gz
android_external_bouncycastle-bf9fc13901d0666be69118222a1eb0161202af5f.tar.bz2
android_external_bouncycastle-bf9fc13901d0666be69118222a1eb0161202af5f.zip
am b44aff7a: Merge "Remove -encoding UTF-8, it is now the default"
* commit 'b44aff7a3b88138f0070630d467c7527cd90c2f3': Remove -encoding UTF-8, it is now the default
-rw-r--r--Android.mk6
1 files changed, 0 insertions, 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