diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-06-18 19:25:30 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-06-18 19:25:30 -0700 |
| commit | 55fa2ea206d89bbebfa3aa697437ae82b71faa22 (patch) | |
| tree | 2391fede304727b82202dd09d91b5d5f8795f6d0 /core/host_dalvik_java_library.mk | |
| parent | 0df5e7270b2b63f3e5955db9b34971a8d9094107 (diff) | |
| parent | 8fd9944e8fc219347858be367f51736e9a1ef341 (diff) | |
| download | build-55fa2ea206d89bbebfa3aa697437ae82b71faa22.zip build-55fa2ea206d89bbebfa3aa697437ae82b71faa22.tar.gz build-55fa2ea206d89bbebfa3aa697437ae82b71faa22.tar.bz2 | |
resolved conflicts for merge of 8fd9944e to master
Change-Id: I1ceda92267675d4ca460b6f990c0acea4b4812a8
Diffstat (limited to 'core/host_dalvik_java_library.mk')
| -rw-r--r-- | core/host_dalvik_java_library.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/host_dalvik_java_library.mk b/core/host_dalvik_java_library.mk index 5024086..61eb3ff 100644 --- a/core/host_dalvik_java_library.mk +++ b/core/host_dalvik_java_library.mk @@ -27,7 +27,7 @@ include $(BUILD_SYSTEM)/host_java_library_common.mk ####################################### ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true) - LOCAL_JAVA_LIBRARIES += core-hostdex + LOCAL_JAVA_LIBRARIES += core-libart-hostdex endif full_classes_compiled_jar := $(intermediates.COMMON)/classes-full-debug.jar |