StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Temporary workaround to build bouncycastle / nist-pkits

Browse Source 
Change-Id: I20bb834f08eeff03f627ab7d8f422a5ba9f3eb1a
This commit is contained in:
Narayan Kamath
2015-12-24 11:35:24 +00:00
parent 5aabca204f
commit 3006881f84
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java_common.mk
View File

@@ -136,6 +136,19 @@ 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