diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-10 03:31:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-10 03:31:44 +0000 |
| commit | 4cce0bff08f526f3652c0323bf6d7e71dd3edea4 (patch) | |
| tree | 4671447866acf9a87dcba47e3af9f7b3ef88785b | |
| parent | c8d5982f30f47cf8674cf2c31370ed52aaaa5c7d (diff) | |
| parent | ffb23a4c8d70763aa29b048fbe43ac409db2d22d (diff) | |
| download | android_external_bouncycastle-4cce0bff08f526f3652c0323bf6d7e71dd3edea4.tar.gz android_external_bouncycastle-4cce0bff08f526f3652c0323bf6d7e71dd3edea4.tar.bz2 android_external_bouncycastle-4cce0bff08f526f3652c0323bf6d7e71dd3edea4.zip | |
am ffb23a4c: Merge "Remove deprecated WITH_HOST_DALVIK."
* commit 'ffb23a4c8d70763aa29b048fbe43ac409db2d22d':
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 |