diff options
| author | Narayan Kamath <narayan@google.com> | 2015-12-24 11:35:24 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-12-24 11:49:45 +0000 |
| commit | 3006881f84c9abf1ab85b77ecd4e815c4cb880d0 (patch) | |
| tree | 4ba4b153d1162462b9b50334a8d09cce040044df | |
| parent | 5aabca204f4175a9b737d63ac10b5f58c4d074e4 (diff) | |
| download | build-3006881f84c9abf1ab85b77ecd4e815c4cb880d0.tar.gz | |
Temporary workaround to build bouncycastle / nist-pkits
Change-Id: I20bb834f08eeff03f627ab7d8f422a5ba9f3eb1a
| -rw-r--r-- | core/java_common.mk | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/core/java_common.mk b/core/java_common.mk index aee31932bd..09fd1fabf2 100644 --- a/core/java_common.mk +++ b/core/java_common.mk @@ -136,6 +136,19 @@ 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 |