commit 472cb6bc8ae71db56558c5ab42c4bbde2cbd6daf
author Narayan Kamath <narayan@google.com> Wed Nov 18 10:56:15 2015 +0000
committer Narayan Kamath <narayan@google.com> Wed Nov 18 12:42:50 2015 +0000
tree 908680baead7fdb16d6a38c78ed025ce4e84222d
parent 3778c8769f05aafdc1bcc8064e8d1a9c1e008783

Add core-oj to the host/target classpaths for jack.

Change-Id: I5bb95e2672fa7ecb344545ffbc2355e7bb7cb708

build/Android.common_path.mk

diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index 8c2e7f9..da337b7 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -89,7 +89,7 @@
 HOST_CORE_DEX_FILES   := $(foreach jar,$(HOST_CORE_JARS),  $(call intermediates-dir-for,JAVA_LIBRARIES,$(jar),t,COMMON)/javalib.jar)
 TARGET_CORE_DEX_FILES := $(foreach jar,$(TARGET_CORE_JARS),$(call intermediates-dir-for,JAVA_LIBRARIES,$(jar), ,COMMON)/javalib.jar)
 
-# Classpath for Jack compilation: we only need core-libart.
-HOST_JACK_CLASSPATH   := $(abspath $(call intermediates-dir-for,JAVA_LIBRARIES,core-libart-hostdex,t,COMMON)/classes.jack)
-TARGET_JACK_CLASSPATH := $(abspath $(call intermediates-dir-for,JAVA_LIBRARIES,core-libart, ,COMMON)/classes.jack)
+# Classpath for Jack compilation: we only need core-libart and core-oj.
+HOST_JACK_CLASSPATH   := $(abspath $(call intermediates-dir-for,JAVA_LIBRARIES,core-libart-hostdex,t,COMMON)/classes.jack):$(abspath $(call intermediates-dir-for,JAVA_LIBRARIES,core-oj-hostdex,t,COMMON)/classes.jack)
+TARGET_JACK_CLASSPATH := $(abspath $(call intermediates-dir-for,JAVA_LIBRARIES,core-libart, ,COMMON)/classes.jack):$(abspath $(call intermediates-dir-for,JAVA_LIBRARIES,core-oj, ,COMMON)/classes.jack)
 endif # ART_ANDROID_COMMON_PATH_MK