diff options
| author | Sebastien Hertz <shertz@google.com> | 2015-02-24 17:39:50 +0100 |
|---|---|---|
| committer | Sebastien Hertz <shertz@google.com> | 2015-07-09 11:23:13 +0200 |
| commit | 5ee9454dfee08a70dec62b0ed0fd4ad274274937 (patch) | |
| tree | 0d59bfc38f70c677d8ecd066618ed17dd838259b /build | |
| parent | c2bf1255ebf360d009dd0763dcea8d2c9b9c676e (diff) | |
| download | art-5ee9454dfee08a70dec62b0ed0fd4ad274274937.zip art-5ee9454dfee08a70dec62b0ed0fd4ad274274937.tar.gz art-5ee9454dfee08a70dec62b0ed0fd4ad274274937.tar.bz2 | |
Support compiling run-tests with jack
This CL adds support to compile run-test source files with jack. When
a test needs to rely on class files, we use jill to convert them to a
jack library.
We need to pass the full classpath to jack containing at least core
classes (like java.lang.Object). This means the Android tree must
have been compiled with jack first so we find all the necessary
classes.jack files.
Some tests still rely on dex files generated with the old toolchain.
We keep building them this way for the moment and will update them
later, when they get ready for Jack.
Also updates a few tests dealing with garbage collection to avoid a
situation where a reference can be retained by a local DEX register.
Bug: 19467889
(cherry picked from commit 19ac0276208f0afef6ba8a4ab34b74a59b8d11d7)
Change-Id: Ia5a989b83430ffe8298a869a1da970b756721bb0
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.common_path.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk index e0c0b0c..b9a449c 100644 --- a/build/Android.common_path.mk +++ b/build/Android.common_path.mk @@ -88,4 +88,8 @@ TARGET_CORE_DEX_LOCATIONS := $(foreach jar,$(TARGET_CORE_JARS),/$(DEXPREOPT_BOOT 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) endif # ART_ANDROID_COMMON_PATH_MK |