diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-10-02 15:51:27 +0200 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2014-10-23 18:42:29 +0200 |
| commit | 74e89c3ba81b93290b7f5a423416669f8e297d73 (patch) | |
| tree | 3b0d79def4ea5e6ef6705bb6e513afb9d52d9024 /junit4 | |
| parent | dee2472546a6570f51cea4b0334bbfdcca392498 (diff) | |
| download | toolchain_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 'junit4')
| -rw-r--r-- | junit4/Android.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/junit4/Android.mk b/junit4/Android.mk index 321f2fa..65add68 100644 --- a/junit4/Android.mk +++ b/junit4/Android.mk @@ -31,8 +31,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) -LOCAL_JAVA_LIBRARIES := core-hostdex - LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-core-hostdex-jack LOCAL_MODULE := junit4-hostdex-jack @@ -41,8 +39,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_BUILD_HOST_DEX := true -include $(BUILD_HOST_JAVA_LIBRARY) - +include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) include $(CLEAR_VARS) |