diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-10 03:25:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-10 03:25:22 +0000 |
| commit | ffb23a4c8d70763aa29b048fbe43ac409db2d22d (patch) | |
| tree | 4671447866acf9a87dcba47e3af9f7b3ef88785b | |
| parent | 8a7034bca063f9248a697c5aab67259798827f97 (diff) | |
| parent | 25235f8917deb6cab3e23533f7fbd40936cdd001 (diff) | |
| download | android_external_bouncycastle-ffb23a4c8d70763aa29b048fbe43ac409db2d22d.tar.gz android_external_bouncycastle-ffb23a4c8d70763aa29b048fbe43ac409db2d22d.tar.bz2 android_external_bouncycastle-ffb23a4c8d70763aa29b048fbe43ac409db2d22d.zip | |
Merge "Remove deprecated WITH_HOST_DALVIK."
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -100,7 +100,6 @@ bouncycastle-proguard-deadcode: $(full_classes_compiled_jar) $(full_java_libs) # 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 @@ -113,7 +112,6 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) endif -endif include $(CLEAR_VARS) LOCAL_MODULE := bouncycastle-host |