diff options
| author | Narayan Kamath <narayan@google.com> | 2013-11-07 16:22:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-07 16:22:14 +0000 |
| commit | 91b81daa60b50c915d5ac032bda4a3d8050695b9 (patch) | |
| tree | a82d02be79171a62974720bdc7e7817249c2a4da /test | |
| parent | 870b57b2afbea4832533d3bed5be788ce4e61466 (diff) | |
| parent | cc8522f6b89e55a1c9abee181874d3ab29441466 (diff) | |
| download | art-91b81daa60b50c915d5ac032bda4a3d8050695b9.tar.gz art-91b81daa60b50c915d5ac032bda4a3d8050695b9.tar.bz2 art-91b81daa60b50c915d5ac032bda4a3d8050695b9.zip | |
Merge "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 da469d75d7..881d664bb2 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -84,10 +84,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 |