diff options
| author | Narayan Kamath <narayan@google.com> | 2013-11-25 19:04:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-11-25 19:04:30 +0000 |
| commit | 1168a05003b5957e62f8c926ec2d0a0dd8bef808 (patch) | |
| tree | 261dbd54dcb908a98be0173704af6bac6fdb39db | |
| parent | c16fe4a6ea7a162a0b7fb519509cf78f295687d9 (diff) | |
| parent | 565b47238713f6ae430101adb577ab1cd8bdb65d (diff) | |
| download | okhttp-1168a05003b5957e62f8c926ec2d0a0dd8bef808.tar.gz | |
Merge "Remove use of LOCAL_BUILD_HOST_DEX"
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -75,10 +75,8 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(okhttp_system_src_files) LOCAL_JAVACFLAGS := -encoding UTF-8 - LOCAL_BUILD_HOST_DEX := true LOCAL_JARJAR_RULES := $(LOCAL_PATH)/jarjar-rules.txt - LOCAL_JAVA_LIBRARIES := conscrypt-hostdex core-hostdex - LOCAL_NO_STANDARD_LIBRARIES := true + LOCAL_JAVA_LIBRARIES := conscrypt-hostdex LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk - include $(BUILD_HOST_JAVA_LIBRARY) + include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) endif |