diff options
| author | Jesse Wilson <jessewilson@google.com> | 2011-06-07 18:53:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-07 18:53:54 -0700 |
| commit | fd92a50839c5327c5d32d65315fde5d52c9da03d (patch) | |
| tree | 49c83a6275a616fd3233de2efcb63c40dbb78e58 /JavaLibrary.mk | |
| parent | 595966593d8931dbaf6951501dc2142de06828d5 (diff) | |
| parent | 09336c914b4fc813e493acc82469b9ad89fd8694 (diff) | |
| download | libcore-fd92a50839c5327c5d32d65315fde5d52c9da03d.zip libcore-fd92a50839c5327c5d32d65315fde5d52c9da03d.tar.gz libcore-fd92a50839c5327c5d32d65315fde5d52c9da03d.tar.bz2 | |
Merge "Use external/mockwebserver in libcore"
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 7230ad0..7179fda 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -104,7 +104,7 @@ LOCAL_SRC_FILES := $(call all-test-java-files-under,dalvik dom json luni support LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit -LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc +LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc mockwebserver LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE_TAGS := tests LOCAL_MODULE := core-tests @@ -170,7 +170,7 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-hostdex core-junit-hostdex - LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc-host + LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc-host mockwebserver-hostdex LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE_TAGS := tests LOCAL_MODULE := core-tests-hostdex |