diff options
| author | Narayan Kamath <narayan@google.com> | 2013-11-07 08:50:02 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-07 08:50:02 -0800 |
| commit | 768124d9bec320a06644618d0813046e48efb606 (patch) | |
| tree | b4ad93aee9593e96c4db3242d4e0d4bd2532b0ce /test | |
| parent | 256c3e4149a30cd3b5f235f52b49d8415c17ed4c (diff) | |
| parent | 91b81daa60b50c915d5ac032bda4a3d8050695b9 (diff) | |
| download | art-768124d9bec320a06644618d0813046e48efb606.tar.gz art-768124d9bec320a06644618d0813046e48efb606.tar.bz2 art-768124d9bec320a06644618d0813046e48efb606.zip | |
am 91b81daa: Merge "Remove usage of LOCAL_BUILD_HOST_DEX"
* commit '91b81daa60b50c915d5ac032bda4a3d8050695b9':
Remove usage of LOCAL_BUILD_HOST_DEX
Diffstat (limited to 'test')
| -rw-r--r-- | test/Android.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/Android.mk b/test/Android.mk index 6d3a84a25f..6b992127e0 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -85,10 +85,9 @@ define build-art-test-dex LOCAL_JAVA_LIBRARIES := $(HOST_CORE_JARS) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_DEX_PREOPT_IMAGE := $(HOST_CORE_IMG_OUT) - LOCAL_BUILD_HOST_DEX := true LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk - include $(BUILD_HOST_JAVA_LIBRARY) + include $(BUILD_DALVIK_HOST_JAVA_LIBRARY) ART_TEST_HOST_DEX_FILES += $$(LOCAL_MODULE_PATH)/$$(LOCAL_MODULE).jar endif endef |