summaryrefslogtreecommitdiffstats
path: root/hamcrest-core
diff options
context:
space:
mode:
authorYohann Roussel <yroussel@google.com>2014-10-02 15:51:27 +0200
committerYohann Roussel <yroussel@google.com>2014-10-23 18:42:29 +0200
commit74e89c3ba81b93290b7f5a423416669f8e297d73 (patch)
tree3b0d79def4ea5e6ef6705bb6e513afb9d52d9024 /hamcrest-core
parentdee2472546a6570f51cea4b0334bbfdcca392498 (diff)
downloadtoolchain_jack-74e89c3ba81b93290b7f5a423416669f8e297d73.zip
toolchain_jack-74e89c3ba81b93290b7f5a423416669f8e297d73.tar.gz
toolchain_jack-74e89c3ba81b93290b7f5a423416669f8e297d73.tar.bz2
Adapt to lmp changes
Build has changed, Libcore targets were renamed. This allows to build the images or to mm in toolchain/jack but not to run test-jack. Conflicts: junit4/Android.mk Change-Id: Idcf3076569c2712560d59165d664b9c9a4e15a1b
Diffstat (limited to 'hamcrest-core')
-rw-r--r--hamcrest-core/Android.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/hamcrest-core/Android.mk b/hamcrest-core/Android.mk
index e41fbde..287aaea 100644
--- a/hamcrest-core/Android.mk
+++ b/hamcrest-core/Android.mk
@@ -20,13 +20,9 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_MODULE := hamcrest-core-hostdex-jack
-LOCAL_BUILD_HOST_DEX := true
-
-LOCAL_JAVA_LIBRARIES := core-hostdex
-
LOCAL_MODULE_TAGS := optional
-include $(BUILD_HOST_JAVA_LIBRARY)
+include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY)
include $(CLEAR_VARS)