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/droiddoc.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/droiddoc.mk')
| -rw-r--r-- | core/droiddoc.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/droiddoc.mk b/core/droiddoc.mk index 2a9cfc6..ea5c2f2 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -65,8 +65,8 @@ ifneq ($(LOCAL_SDK_VERSION),) $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, sdk_v$(LOCAL_SDK_VERSION)) endif else - LOCAL_JAVA_LIBRARIES := core ext framework framework2 $(LOCAL_JAVA_LIBRARIES) - $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, core) + LOCAL_JAVA_LIBRARIES := core-libart ext framework framework2 $(LOCAL_JAVA_LIBRARIES) + $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, core-libart) endif # LOCAL_SDK_VERSION LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES)) |