| commit | cbb799a6e05bbb82d66619a551283621cbe2f3a7 | [log] [tgz] |
|---|---|---|
| author | Brett Chabot <brettchabot@google.com> | Mon Jun 16 17:52:29 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 12 17:09:07 2014 +0000 |
| tree | b18d557dc268c8f3d02642115009b90c64b49b88 | |
| parent | 19fa6b81908cfe9556d71f4149eb55d77bbc5e91 [diff] | |
| parent | f5e9a2415ec42c425c2bb17db46f2a9649992d80 [diff] |
Merge "Add hamcrest 1.1 library and integration source"
diff --git a/Android.mk b/Android.mk index e4fa21f..3948f8e 100644 --- a/Android.mk +++ b/Android.mk
@@ -26,13 +26,11 @@ # build for the host dalvik # ------------------------- -ifeq ($(WITH_HOST_DALVIK),true) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE := hamcrest-hostdex LOCAL_MODULE_TAGS := optional include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) -endif