p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Temporary workaround to build bouncycastle / nist-pkits" 

This reverts commit 3006881f84.
This commit is contained in:
Narayan Kamath 2015-12-24 12:39:51 +00:00
parent 8b9589216d
commit cdc3d5ac03
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/java_common.mk
View File

@ -136,19 +136,6 @@ ifeq ($(LOCAL_SDK_VERSION),)
ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true) ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
# No bootclasspath. But we still need "" to prevent javac from using default host bootclasspath. # No bootclasspath. But we still need "" to prevent javac from using default host bootclasspath.
my_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 else # LOCAL_NO_STANDARD_LIBRARIES
my_bootclasspath := $(call java-lib-files,core-oj):$(call java-lib-files,core-libart) my_bootclasspath := $(call java-lib-files,core-oj):$(call java-lib-files,core-libart)
endif # LOCAL_NO_STANDARD_LIBRARIES endif # LOCAL_NO_STANDARD_LIBRARIES