diff options
| author | Neil Fuller <nfuller@google.com> | 2016-02-16 13:09:31 +0000 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2016-02-16 13:17:27 +0000 |
| commit | 6ed4776c09a8c5d0f57b8fc2a3d712e109166b77 (patch) | |
| tree | 6f9bbec2ff216b4932c8370f200e9e579d7d45f4 | |
| parent | 79d3bf2425a53baab7feb744dad710b6c15533c9 (diff) | |
| download | bouncycastle-6ed4776c09a8c5d0f57b8fc2a3d712e109166b77.tar.gz | |
Force bouncycastle to continue to use v51 (1.7) .class files
The default is changing to v52 (1.8).
The build for this package uses jarjar to repackage .class files.
The version of jarjar in the Android tree does not currently
support v52 .class files.
Bug: 26753820
Change-Id: Ie1e926ad429f60784158ff75102f9d1cde51272d
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -42,6 +42,7 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk + LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_JAVA_LIBRARY) # non-jarjar version to build okhttp-tests @@ -52,6 +53,7 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk + LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_STATIC_JAVA_LIBRARY) # unbundled bouncycastle jar @@ -62,6 +64,7 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_SRC_FILES := $(ri_bcprov_src_files) LOCAL_MODULE_TAGS := optional LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk + LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_STATIC_JAVA_LIBRARY) endif # TARGET_BUILD_PDK != true @@ -117,6 +120,7 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_JAVA_LIBRARIES := conscrypt-hostdex LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk + LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) endif # ($(HOST_OS),linux) endif @@ -127,6 +131,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(ri_bcprov_src_files) LOCAL_MODULE_TAGS := optional LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_HOST_JAVA_LIBRARY) include $(CLEAR_VARS) @@ -136,4 +141,5 @@ LOCAL_SRC_FILES := $(call all-java-files-under,bcpkix/src/main/java) LOCAL_MODULE_TAGS := optional LOCAL_JAVA_LIBRARIES := bouncycastle-host LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_JAVA_LANGUAGE_VERSION := 1.7 include $(BUILD_HOST_JAVA_LIBRARY) |