diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-07 10:16:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-07 10:16:48 +0000 |
| commit | 75c094164ecc6ffaecd985b06edd60562fbf084b (patch) | |
| tree | aa86db8c5840228d4e822cfead45846253357433 | |
| parent | 66020afc08ec1a477d2efa133dcd59cde3978a1b (diff) | |
| parent | 25324b6b2c70b3282cc11eef96b6cb33d5cfeee8 (diff) | |
| download | android_external_bouncycastle-75c094164ecc6ffaecd985b06edd60562fbf084b.tar.gz android_external_bouncycastle-75c094164ecc6ffaecd985b06edd60562fbf084b.tar.bz2 android_external_bouncycastle-75c094164ecc6ffaecd985b06edd60562fbf084b.zip | |
am 25324b6b: Merge "Build bouncycastle-hostdex only on linux hosts."
* commit '25324b6b2c70b3282cc11eef96b6cb33d5cfeee8':
Build bouncycastle-hostdex only on linux hosts.
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -108,9 +108,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. +# Conscrypt isn't built in the PDK or on non-linux OSes, so this cannot be built +# because it has a dependency on conscrypt-hostdex. ifneq ($(TARGET_BUILD_PDK),true) + ifeq ($(HOST_OS),linux) include $(CLEAR_VARS) LOCAL_MODULE := bouncycastle-hostdex LOCAL_MODULE_TAGS := optional @@ -121,6 +122,7 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) + endif # ($(HOST_OS),linux) endif include $(CLEAR_VARS) |