summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-04-02 20:58:21 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-04-02 20:58:21 +0000
commit9b477023d7675c4614a16e14c2aace73f249ad2c (patch)
tree3d30342f659c6be1236b9ba3a1de4a6927b1b3e9
parentd0438f5e945bdb79e68039a8222531cbfdc1cc27 (diff)
parentf510b3c7e72699f02afa653a995116847686a29b (diff)
downloadmockwebserver-9b477023d7675c4614a16e14c2aace73f249ad2c.tar.gz
Merge "mockwebserver only needs to depend on core.jar"
-rw-r--r--Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 4727d3d..7a064e3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,6 +21,9 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(mockwebserver_src_files)
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := mockwebserver
+LOCAL_JAVA_LIBRARIES := core
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_STATIC_JAVA_LIBRARY)
ifeq ($(WITH_HOST_DALVIK),true)
@@ -28,5 +31,6 @@ ifeq ($(WITH_HOST_DALVIK),true)
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