From cdc3d5ac034b26a2327c498c529ff52950dfc5b3 Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Thu, 24 Dec 2015 12:39:51 +0000 Subject: [PATCH] Revert "Temporary workaround to build bouncycastle / nist-pkits" This reverts commit 3006881f84c9abf1ab85b77ecd4e815c4cb880d0. --- core/java_common.mk | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/core/java_common.mk b/core/java_common.mk index 09fd1fabf..aee31932b 100644 --- a/core/java_common.mk +++ b/core/java_common.mk @@ -136,19 +136,6 @@ ifeq ($(LOCAL_SDK_VERSION),) ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true) # No bootclasspath. But we still need "" to prevent javac from using default host bootclasspath. my_bootclasspath := "" - -# Temporary HACK to fix the classpath for bouncycastle / nist-pkix-tests. -# Will be reverted shortly. -ifeq ($(LOCAL_MODULE),bouncycastle) -LOCAL_JAVA_LIBRARIES += core-oj -endif -ifeq ($(LOCAL_MODULE),nist-pkix-tests) -LOCAL_JAVA_LIBRARIES += core-oj -endif -ifeq ($(LOCAL_MODULE),bouncycastle-nojarjar) -LOCAL_JAVA_LIBRARIES += core-oj -endif - else # LOCAL_NO_STANDARD_LIBRARIES my_bootclasspath := $(call java-lib-files,core-oj):$(call java-lib-files,core-libart) endif # LOCAL_NO_STANDARD_LIBRARIES