diff options
| author | Colin Cross <ccross@android.com> | 2017-01-19 14:13:37 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-01-19 16:35:44 -0800 |
| commit | a0a80cc6949a936049bf7aaa859546b761a21de6 (patch) | |
| tree | ae279ba29e39d677c540119a52ea84f4390da616 | |
| parent | fba1a1dba277746d3be0667de9eb4b98494a1963 (diff) | |
| download | bouncycastle-a0a80cc6949a936049bf7aaa859546b761a21de6.tar.gz | |
Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for bouncycastle-*-hostdex
BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY must be used for libraries
that will be linked with LOCAL_STATIC_JAVA_LIBRARIES.
Test: m -j java
Change-Id: I565315655d2c6d5504a1901dd4fbe6c209130c34
| -rw-r--r-- | Android.mk | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -152,7 +152,7 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(all_bcprov_src_files) LOCAL_JAVA_LIBRARIES := conscrypt-hostdex - include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) + include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := bouncycastle-hostdex @@ -167,25 +167,25 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_MODULE := bouncycastle-bcpkix-hostdex-nojarjar LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(all_bcpkix_src_files) - LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex-nojarjar - include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) + LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-hostdex-nojarjar + include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := bouncycastle-bcpkix-hostdex LOCAL_MODULE_TAGS := optional LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-bcpkix-hostdex-nojarjar - LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex-nojarjar + LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-hostdex-nojarjar LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt - include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) + include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY) # OCSP classes used for testing include $(CLEAR_VARS) LOCAL_MODULE := bouncycastle-ocsp-hostdex LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(all_bc_ocsp_files) - LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex-nojarjar bouncycastle-bcpkix-hostdex-nojarjar + LOCAL_STATIC_JAVA_LIBRARIES := bouncycastle-hostdex-nojarjar bouncycastle-bcpkix-hostdex-nojarjar LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt - include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) + include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY) endif # ($(HOST_OS),linux) endif |