diff options
| author | Narayan Kamath <narayan@google.com> | 2015-11-17 12:37:27 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-11-17 12:37:27 +0000 |
| commit | d50687efe56a0516e0df17f65e8fce43681b3c42 (patch) | |
| tree | 94047e789847c4ae717bdc235db9c5e21c8327e4 /build/Android.gtest.mk | |
| parent | 51147f2188e96be9260170452d7c624c4fa81727 (diff) | |
| download | art-d50687efe56a0516e0df17f65e8fce43681b3c42.tar.gz art-d50687efe56a0516e0df17f65e8fce43681b3c42.tar.bz2 art-d50687efe56a0516e0df17f65e8fce43681b3c42.zip | |
Fix a few art-test related issues.
- Add core-oj to the list of sync targets.
- Fix --no-image by setting the boot classpath properly.
- Demonstrate T7-9 vision.
Change-Id: I84b6afbbcf09a70c7afe6a35cb9782c86137db84
Diffstat (limited to 'build/Android.gtest.mk')
| -rw-r--r-- | build/Android.gtest.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 170a6fc39a..69f7e3439f 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -334,7 +334,8 @@ define define-art-gtest-rule-target $$(ART_TARGET_NATIVETEST_OUT)/$$(TARGET_$(2)ARCH)/$(1) \ $$($(2)TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so \ $$($(2)TARGET_OUT_SHARED_LIBRARIES)/libxxavacore.so \ - $$(TARGET_OUT_JAVA_LIBRARIES)/core-libart.jar + $$(TARGET_OUT_JAVA_LIBRARIES)/core-libart.jar \ + $$(TARGET_OUT_JAVA_LIBRARIES)/core-oj.jar .PHONY: $$(gtest_rule) $$(gtest_rule): test-art-target-sync |