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/base_rules.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/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 548ed13..fbf9770 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -405,7 +405,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JAVA_LIBRARIES := $(full_static_ja # be up-to-date. ifdef LOCAL_IS_HOST_MODULE ifeq ($(USE_CORE_LIB_BOOTCLASSPATH),true) -$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-deps,core-hostdex,$(LOCAL_IS_HOST_MODULE)) +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-deps,core-libart-hostdex,$(LOCAL_IS_HOST_MODULE)) full_shared_java_libs := $(call java-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE)) full_java_lib_deps := $(call java-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE)) |