commit 9b477023d7675c4614a16e14c2aace73f249ad2c
author Brian Carlstrom <bdc@google.com> Tue Apr 02 20:58:21 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 02 20:58:21 2013 +0000
tree 3d30342f659c6be1236b9ba3a1de4a6927b1b3e9
parent d0438f5e945bdb79e68039a8222531cbfdc1cc27
parent f510b3c7e72699f02afa653a995116847686a29b

Merge "mockwebserver only needs to depend on core.jar"

Android.mk

diff --git a/Android.mk b/Android.mk
index 4727d3d..7a064e3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,6 +21,9 @@
 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 @@
     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