openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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

am: 54a5e368fe

* commit '54a5e368fea461a265374db9ecf2c0b4c6825460':
  Revert "Temporary workaround to build bouncycastle / nist-pkits"
This commit is contained in:
Narayan Kamath 2015-12-30 11:47:12 +00:00 committed by android-build-merger
parent 45ae4eb8a2 54a5e368fe
commit 4baa857e6d
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)
# 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