diff options
| author | Kenny Root <kroot@google.com> | 2013-10-18 13:57:35 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-10-18 14:22:37 -0700 |
| commit | 46b2b1a974e08d4edd04aefc5e79076bae82809f (patch) | |
| tree | 976454eda1044b61da323262f664af28d79ae2c0 | |
| parent | 93bd3a9d8c99d7910d513b712192991646fb0a1d (diff) | |
| download | android_external_bouncycastle-46b2b1a974e08d4edd04aefc5e79076bae82809f.tar.gz android_external_bouncycastle-46b2b1a974e08d4edd04aefc5e79076bae82809f.tar.bz2 android_external_bouncycastle-46b2b1a974e08d4edd04aefc5e79076bae82809f.zip | |
Do not build bouncycastle-hostdex for PDK
Conscrypt is not in the PDK build, so don't build modules that depend on
it.
Change-Id: Iaf950650e937eb12578295af1ec876c05923d753
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -98,7 +98,10 @@ bouncycastle-proguard-deadcode: $(full_classes_compiled_jar) $(full_java_libs) public java.lang.String getPaddingName(); \ }" +# Conscrypt isn't built in the PDK, so this cannot be built because it has a +# dependency on conscrypt-hostdex. ifeq ($(WITH_HOST_DALVIK),true) +ifneq ($(TARGET_BUILD_PDK),true) include $(CLEAR_VARS) LOCAL_MODULE := bouncycastle-hostdex LOCAL_MODULE_TAGS := optional @@ -111,6 +114,7 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_HOST_JAVA_LIBRARY) endif +endif include $(CLEAR_VARS) LOCAL_MODULE := bouncycastle-host |