diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-06-25 23:28:49 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-06-25 23:29:24 -0700 |
| commit | eae05507f22a9f58d2058514496afd0f9b3e94b6 (patch) | |
| tree | b2ba51ef226919cdd6c34063124a5b568c3fecc2 /build | |
| parent | 9c7ca420ca940ac778f64ac2277792b47779e1fb (diff) | |
| download | art-eae05507f22a9f58d2058514496afd0f9b3e94b6.zip art-eae05507f22a9f58d2058514496afd0f9b3e94b6.tar.gz art-eae05507f22a9f58d2058514496afd0f9b3e94b6.tar.bz2 | |
Make art use core-libart explicitly (part 2)
Change-Id: Id08306ae147c745a407635d6ce93019f14145181
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.oat.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build/Android.oat.mk b/build/Android.oat.mk index 05f15e7..0e91b43 100644 --- a/build/Android.oat.mk +++ b/build/Android.oat.mk @@ -82,6 +82,7 @@ endif ######################################################################## # The full system boot classpath TARGET_BOOT_JARS := $(subst :, ,$(DEXPREOPT_BOOT_JARS)) +TARGET_BOOT_JARS := $(foreach jar,$(TARGET_BOOT_JARS),$(patsubst core, core-libart,$(jar))) TARGET_BOOT_DEX_LOCATIONS := $(foreach jar,$(TARGET_BOOT_JARS),/$(DEXPREOPT_BOOT_JAR_DIR)/$(jar).jar) TARGET_BOOT_DEX_FILES := $(foreach jar,$(TARGET_BOOT_JARS),$(call intermediates-dir-for,JAVA_LIBRARIES,$(jar),,COMMON)/javalib.jar) |