commit 111ccebf3036f5d28b1237396a81cd4a9df98dc4
author Ying Wang <wangying@android.com> Tue Jun 24 10:38:49 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 24 10:38:49 2014 +0000
tree 4a90e0f1a25d23f78c684f117e5726b7897b4ca9
parent 7df87a04f90e1cfac81b4a5b33cc27bc0528c11b
parent 995783d4fde29634e9c61379db5fedad0a232089

am 995783d4: am 57befc90: am eb12847b: Merge "Switch another reference from core to core-libart"

* commit '995783d4fde29634e9c61379db5fedad0a232089':
  Switch another reference from core to core-libart

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index fbf9770..5406607 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -383,7 +383,7 @@
 $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_OBJECTS := $(patsubst %.java,%.class,$(LOCAL_SRC_FILES))
 ifeq ($(my_prefix),TARGET_)
 ifeq ($(LOCAL_SDK_VERSION),)
-$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,core)
+$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,core-libart)
 else
 ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),current)
 # LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS.