From 3605ad3532b18d3096d2f67218a769963a586cfb Mon Sep 17 00:00:00 2001 From: Przemyslaw Szczepaniak Date: Mon, 4 Apr 2016 13:34:16 +0100 Subject: Fix bouncycastle-bcpkix build breakage. Bug: 27812109 Change-Id: I80121e6a685fe9be8f68492ccbfd1864a317874b --- Android.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 23bb8d74..9487e0fd 100644 --- a/Android.mk +++ b/Android.mk @@ -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) -- cgit v1.2.3