diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-10 03:26:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-10 03:26:32 +0000 |
| commit | 272a7a31c814dbd3e372ae124e0cb6d0b034fdc0 (patch) | |
| tree | 46943ad18d659dbaad1e32df4c2d4107fd922354 | |
| parent | e0a7e7464bc44c515b87ac8c360a0dbcb95ec18f (diff) | |
| parent | f3dd14d5bc7ecef3e9564e2a3aa958f8214c3df1 (diff) | |
| download | mockwebserver-272a7a31c814dbd3e372ae124e0cb6d0b034fdc0.tar.gz | |
Merge "Remove deprecated WITH_HOST_DALVIK."
| -rw-r--r-- | Android.mk | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -26,11 +26,9 @@ LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY) -ifeq ($(WITH_HOST_DALVIK),true) - include $(CLEAR_VARS) - LOCAL_SRC_FILES := $(mockwebserver_src_files) - LOCAL_MODULE_TAGS := optional - LOCAL_MODULE := mockwebserver-host - LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk - include $(BUILD_HOST_JAVA_LIBRARY) -endif +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(mockwebserver_src_files) +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := mockwebserver-host +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +include $(BUILD_HOST_JAVA_LIBRARY) |