diff options
| author | Narayan Kamath <narayan@google.com> | 2013-11-25 19:04:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-11-25 19:04:49 +0000 |
| commit | fcecdbf6172e998667a01a57d83336354d00deb0 (patch) | |
| tree | 27f5ae3bffc59a026ac18027b8747e3db935f935 | |
| parent | 32ec24a7b74034d035d23535a8db7826a156d8e9 (diff) | |
| parent | 108187403f811ba04eda585fd1d94ef93a5bd173 (diff) | |
| download | bouncycastle-fcecdbf6172e998667a01a57d83336354d00deb0.tar.gz | |
Merge "Remove uses of LOCAL_BUILD_HOST_DEX."
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -107,12 +107,11 @@ ifneq ($(TARGET_BUILD_PDK),true) LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(all_bcprov_src_files) LOCAL_JAVACFLAGS := -encoding UTF-8 - LOCAL_BUILD_HOST_DEX := true LOCAL_MODULE_TAGS := optional LOCAL_JAVA_LIBRARIES := conscrypt-hostdex LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk - include $(BUILD_HOST_JAVA_LIBRARY) + include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) endif endif |