diff options
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2016-04-04 13:34:16 +0100 |
|---|---|---|
| committer | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2016-04-04 13:49:35 +0000 |
| commit | 3605ad3532b18d3096d2f67218a769963a586cfb (patch) | |
| tree | afbbb41ca9b4e56a0dd8e7580ed0c22d5cbad5cd /Android.mk | |
| parent | c06fea500960568efe0dcacb04af200ab9c01ad5 (diff) | |
| download | bouncycastle-3605ad3532b18d3096d2f67218a769963a586cfb.tar.gz | |
Fix bouncycastle-bcpkix build breakage.
Bug: 27812109
Change-Id: I80121e6a685fe9be8f68492ccbfd1864a317874b
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -78,13 +78,16 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_MODULE := bouncycastle-bcpkix-nojarjar LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(all_bcpkix_src_files) - LOCAL_JAVA_LIBRARIES := bouncycastle-nojarjar + LOCAL_NO_STANDARD_LIBRARIES := true + LOCAL_JAVA_LIBRARIES := bouncycastle-nojarjar core-oj core-libart conscrypt include $(BUILD_STATIC_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := bouncycastle-bcpkix LOCAL_MODULE_TAGS := optional LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-bcpkix-nojarjar + LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt + LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt include $(BUILD_STATIC_JAVA_LIBRARY) |