Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4baa857e authored by Narayan Kamath's avatar Narayan Kamath Committed by android-build-merger
Browse files

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

am: 54a5e368

* commit '54a5e368':
  Revert "Temporary workaround to build bouncycastle / nist-pkits"
parents 45ae4eb8 54a5e368

core/java_common.mk

+0 −13
Original line number Diff line number Diff line
@@ -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