diff options
| author | Ying Wang <wangying@android.com> | 2014-06-24 10:38:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-24 10:38:49 +0000 |
| commit | 111ccebf3036f5d28b1237396a81cd4a9df98dc4 (patch) | |
| tree | 4a90e0f1a25d23f78c684f117e5726b7897b4ca9 /core/base_rules.mk | |
| parent | 7df87a04f90e1cfac81b4a5b33cc27bc0528c11b (diff) | |
| parent | 995783d4fde29634e9c61379db5fedad0a232089 (diff) | |
| download | build-111ccebf3036f5d28b1237396a81cd4a9df98dc4.zip build-111ccebf3036f5d28b1237396a81cd4a9df98dc4.tar.gz build-111ccebf3036f5d28b1237396a81cd4a9df98dc4.tar.bz2 | |
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
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 fbf9770..5406607 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -383,7 +383,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_SOURCES := $(all_java_sources) $(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. |